Skip to content

Commit

Permalink
Kleiner Betabugfix und weiter #1515
Browse files Browse the repository at this point in the history
  • Loading branch information
@GeniusTimo
GeniusTimo committed Jul 17, 2020
1 parent 7af1e7e commit 56e2156
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 47 deletions.
10 changes: 5 additions & 5 deletions js/web/_main/js/_main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1935,7 +1935,7 @@ let MainParser = {
setConversations: (d)=> {

// Falls der Cache leer ist den Speicher auslesen
if (MainParser.Conversations.length === 0){
if (MainParser.Conversations.length === 0) {
let StorageHeader = localStorage.getItem('ConversationsHeaders');
if (StorageHeader !== null) {
MainParser.Conversations = JSON.parse(StorageHeader);
Expand All @@ -1944,14 +1944,14 @@ let MainParser = {

// neues Postfach
if (d['category'] && d['category']['teasers']) {
for(let k in d['category']['teasers']){
if (!d['category']['teasers'].hasOwnProperty(k)){
for (let k in d['category']['teasers']) {
if (!d['category']['teasers'].hasOwnProperty(k)) {
continue;
}

let key = MainParser.Conversations.findIndex((obj)=> (obj.id === d['category']['teasers'][k]['id']));
// Ist bereits ein Key vorhanden?
if (key !== -1){
if (key !== -1) {
MainParser.Conversations[key]['type'] = d['category']['type'];
MainParser.Conversations[key]['title'] = d['category']['teasers'][k]['title'];
MainParser.Conversations[key]['hidden'] = d['category']['teasers'][k]['isHidden'];
Expand Down Expand Up @@ -2021,7 +2021,7 @@ let MainParser = {
}
}

if (MainParser.Conversations.length > 0){
if (MainParser.Conversations.length > 0) {
// Dopplungen entfernen und Daten lokal abspeichern
MainParser.Conversations = [...new Set(MainParser.Conversations.map(s => JSON.stringify(s)))].map(s => JSON.parse(s));
localStorage.setItem('ConversationsHeaders', JSON.stringify(MainParser.Conversations));
Expand Down
74 changes: 32 additions & 42 deletions js/web/infoboard/js/infoboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,40 +337,55 @@ let Info = {
* @returns {{class: 'message', msg: string, type: string}}
*/
ConversationService_getNewMessage: (d) => {
let msg;
let header; let message; let chat = MainParser.Conversations.find(obj => obj.id === d['conversationId']);
if (chat && chat['hidden']) return undefined;

if (d['text'] !== '') {
msg = d['text'].replace(/(\r\n|\n|\r)/gm, '<br>');
// normale Nachricht
message = d['text'].replace(/(\r\n|\n|\r)/gm, '<br>');

} else if (d['attachment'] !== undefined) {

// Greatbuilding
// legendäres Bauwerk
if (d['attachment']['type'] === 'great_building') {
msg = HTML.i18nReplacer(
message = HTML.i18nReplacer(
i18n('Boxes.Infobox.Messages.MsgBuilding'), {
'building': MainParser.CityEntities[d['attachment']['cityEntityId']]['name'],
'level': d['attachment']['level']
}
)
});
}
// Trade
// Handelsangebot
else if (d['attachment']['type'] === 'trade_offer') {
msg = `<div class="offer"><span title="${GoodsData[d['attachment']['offeredResource']]['name']}" class="goods-sprite-50 ${d['attachment']['offeredResource']}"></span> <span>x<strong>${d['attachment']['offeredAmount']}</strong></span> <span class="sign">&#187</span> <span title="${GoodsData[d['attachment']['neededResource']]['name']}" class="goods-sprite-50 ${d['attachment']['neededResource']}"></span> <span>x<strong>${d['attachment']['neededAmount']}</strong></span></div>`;
message = `<div class="offer"><span title="${GoodsData[d['attachment']['offeredResource']]['name']}" class="goods-sprite-50 ${d['attachment']['offeredResource']}"></span> <span>x<strong>${d['attachment']['offeredAmount']}</strong></span> <span class="sign">&#187</span> <span title="${GoodsData[d['attachment']['neededResource']]['name']}" class="goods-sprite-50 ${d['attachment']['neededResource']}"></span> <span>x<strong>${d['attachment']['neededAmount']}</strong></span></div>`;
}
} else {
return undefined;
}

if (undefined === d.sender) {
return {
class: 'message',
type: i18n('Boxes.Infobox.FilterMessage'),
msg: Info.GetConversationHeader(d.conversationId, null) + msg
};
if (chat != null) {
if (d['sender']['name'] != null) {
// normale Chatnachricht (bekannte ID)
if (chat['important']) {
header = '<div><strong style="color:#ffb539">' + chat['title'] + '</strong> - <em>' + d['sender']['name'] + '</em> ⚠️</div>';
} else if (chat['favorite']) {
header = '<div><strong style="color:#ffb539">' + chat['title'] + '</strong> - <em>' + d['sender']['name'] + '</em> ⭐</div>';
} else {
header = '<div><strong style="color:#ffb539">' + chat['title'] + '</strong> - <em>' + d['sender']['name'] + '</em></div>';
}
} else {
// Chatnachricht vom System (Betreten/Verlassen)
header = '<div><strong style="color:#ffb539">' + header.title + '</strong></div>';
}
} else if (d['sender']['name'] != null) {
// normale Chatnachricht (unbekannte ID)
header = '<div><strong style="color:#ffb539">' + name + '</strong></div>';
} else {
header = ''
}

return {
class: 'message',
type: i18n('Boxes.Infobox.FilterMessage'),
msg: Info.GetConversationHeader(d['conversationId'], d['sender']['name']) + msg
msg: header + message
};
},

Expand Down Expand Up @@ -400,7 +415,7 @@ let Info = {
if (data['lockedUntil'] !== undefined) {

// keine Übernahme
if (data['lockedUntil'] < Date.now() + 14390) return undefined;
if (data['lockedUntil'] < Math.floor(Date.now() / 1000) + 14390) return undefined;

let p = bP.find(o => (o['participantId'] === data['ownerId'])),
colors = GildFights.SortedColors.find(c => (c['id'] === data['ownerId']));
Expand Down Expand Up @@ -553,30 +568,5 @@ let Info = {
}
)
};
},


/**
* Sucht den Titel einer Nachricht heraus
*
* @param id
* @param {string} name
* @returns {string}
*/
GetConversationHeader: (id, name) => {
let header = MainParser.Conversations.find(obj => obj.id === id);
if (header != null && name != null) {
// z.B. normale Chat-Nachricht mit bekannter Chat-ID
return '<div><strong style="color:#ffb539">' + header.title + '</strong> - <em>' + name + '</em></div>';
} else if (name != null) {
// z.B. normale Chat-Nachricht mit unbekannter Chat-ID
return '<div><strong style="color:#ffb539">' + name + '</strong></div>';
} else if (header != null) {
// z.B. normale Chat-ereignis-Nachricht mit bekannter Chat-ID (xyz wurde hinzugefügt/hat chat verlassen)
return '<div><strong style="color:#ffb539">' + header.title + '</strong></div>';
}

return '';
}
};

0 comments on commit 56e2156

Please sign in to comment.