astra
/
ntfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make small code style improvements

pull/750/head
nimbleghost 2023-05-24 20:47:19 +02:00
parent d178be7576
commit da17e4ee8a
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/app/ConnectionManager.js
View File

@ -61,9 +61,7 @@ class ConnectionManager {
const { connectionId } = subscription; const { connectionId } = subscription;
const added = !this.connections.get(connectionId); const added = !this.connections.get(connectionId);
if (added) { if (added) {
const { baseUrl } = subscription; const { baseUrl, topic, user } = subscription;
const { topic } = subscription;
const { user } = subscription;
const since = subscription.last; const since = subscription.last;
const connection = new Connection( const connection = new Connection(
connectionId, connectionId,

4
web/src/app/utils.js
View File

@ -118,10 +118,10 @@ export const maybeWithBearerAuth = (headers, token) => {
export const withBasicAuth = (headers, username, password) => ({ ...headers, Authorization: basicAuth(username, password) }); export const withBasicAuth = (headers, username, password) => ({ ...headers, Authorization: basicAuth(username, password) });
export const maybeWithAuth = (headers, user) => { export const maybeWithAuth = (headers, user) => {
if (user && user.password) { if (user?.password) {
return withBasicAuth(headers, user.username, user.password); return withBasicAuth(headers, user.username, user.password);
} }
if (user && user.token) { if (user?.token) {
return withBearerAuth(headers, user.token); return withBearerAuth(headers, user.token);
} }
return headers; return headers;

12
web/src/components/EmojiPicker.jsx
View File

@ -127,17 +127,7 @@ const Category = (props) => {
); );
}; };
const emojiMatches = (emoji, words) => { const emojiMatches = (emoji, words) => words.length === 0 || words.some((word) => emoji.searchBase.includes(word));
if (words.length === 0) {
return true;
}
for (const word of words) {
if (emoji.searchBase.indexOf(word) === -1) {
return false;
}
}
return true;
};
const Emoji = (props) => { const Emoji = (props) => {
const { emoji } = props; const { emoji } = props;