ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

make int channel just show for languages that don't have one and aren't english

Browse Source
This commit is contained in:
HF 2021-01-31 21:26:10 +01:00
parent 4ca75a586a
commit fb4ee3e83d
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ChannelDropDown.jsx
View File

@ -90,14 +90,14 @@ const ChannelDropDown = ({
// latest lastTs first // latest lastTs first
sortChansNew.sort((c1, c2) => { sortChansNew.sort((c1, c2) => {
// determins if default channels get sorted too // determins if default channels get sorted too
// if (c1[3] === 0 || c2[3] === 0) return 0; if (c1[3] === 0 || c2[3] === 0) return 0;
if (c1[4] > c2[4]) return -1; if (c1[4] > c2[4]) return -1;
if (c2[4] > c1[4]) return 1; if (c2[4] > c1[4]) return 1;
return 0; return 0;
}); });
// unread first // unread first
sortChansNew.sort((c1, c2) => { sortChansNew.sort((c1, c2) => {
// if (c1[3] === 0 || c2[3] === 0) return 0; if (c1[3] === 0 || c2[3] === 0) return 0;
if (c1[1] && !c2[1]) return -1; if (c1[1] && !c2[1]) return -1;
if (c2[1] && !c1[1]) return 1; if (c2[1] && !c1[1]) return 1;
return 0; return 0;

53
src/core/ChatProvider.js
View File

@ -15,9 +15,8 @@ export class ChatProvider {
constructor() { constructor() {
this.defaultChannels = {}; this.defaultChannels = {};
this.langChannels = {}; this.langChannels = {};
this.langChannelIds = [];
this.enChannelId = 0; this.enChannelId = 0;
this.intChannelId = 0; this.intChannel = {};
this.infoUserId = 1; this.infoUserId = 1;
this.eventUserId = 1; this.eventUserId = 1;
this.caseCheck = /^[A-Z !.]*$/; this.caseCheck = /^[A-Z !.]*$/;
@ -62,17 +61,20 @@ export class ChatProvider {
}, },
}); });
const { id, type, lastTs } = channel[0]; const { id, type, lastTs } = channel[0];
if (name === 'int') {
this.intChannelId = id;
}
if (name === 'en') { if (name === 'en') {
this.enChannelId = id; this.enChannelId = id;
} }
this.defaultChannels[id] = [ if (name === 'int') {
name, this.intChannel = {
type, [id]: [name, type, lastTs],
lastTs, };
]; } else {
this.defaultChannels[id] = [
name,
type,
lastTs,
];
}
} }
// find or create non-english lang channels // find or create non-english lang channels
const langs = Object.keys(ttags); const langs = Object.keys(ttags);
@ -94,7 +96,6 @@ export class ChatProvider {
type, type,
lastTs, lastTs,
}; };
this.langChannelIds[id] = name;
} }
// find or create default users // find or create default users
let name = INFO_USER_NAME; let name = INFO_USER_NAME;
@ -128,17 +129,21 @@ export class ChatProvider {
} }
getDefaultChannels(lang) { getDefaultChannels(lang) {
const { defaultChannels, langChannels } = this; let langChannel = {};
const langChannel = {}; if (lang && lang !== 'default') {
if (lang && lang !== 'default' && langChannels[lang]) { const { langChannels } = this;
const { if (langChannels[lang]) {
id, type, lastTs, const {
} = langChannels[lang]; id, type, lastTs,
langChannel[id] = [lang, type, lastTs]; } = langChannels[lang];
langChannel[id] = [lang, type, lastTs];
} else {
langChannel = this.intChannel;
}
} }
return { return {
...langChannel, ...langChannel,
...defaultChannels, ...this.defaultChannels,
}; };
} }
@ -172,8 +177,14 @@ export class ChatProvider {
if (this.defaultChannels[cid]) { if (this.defaultChannels[cid]) {
return true; return true;
} }
if (this.langChannelIds[cid] const { lang } = user;
&& this.langChannelIds[cid] === user.lang) { if (this.langChannels[lang]
&& this.langChannels[lang].id === cid) {
return true;
}
if (this.intChannel[cid]
&& user.lang !== 'default'
&& !this.langChannels[user.lang]) {
return true; return true;
} }
if (user.channels[cid]) { if (user.channels[cid]) {

3
src/utils/location.js
View File

@ -39,6 +39,9 @@ export function languageFromLocalisation(localisation) {
if (i !== -1) { if (i !== -1) {
lang = lang.slice(0, i); lang = lang.slice(0, i);
} }
if (lang === 'en') {
lang = 'default';
}
return lang; return lang;
} }