From 3584513dcae67e9048eec90cbd42c0a6a2f9c44e Mon Sep 17 00:00:00 2001 From: Armine Simonyan <128052346+armine-fliplet@users.noreply.github.com> Date: Thu, 11 Jul 2024 13:36:07 +0400 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"ID-3415=20[FIX]=20Chat=20wa?= =?UTF-8?q?s=20replaced=20with=20conversation=20if=20the=20user=E2=80=A6"?= =?UTF-8?q?=20(#142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 730978a6eb737df99477dfa44ca31152b7bf591c. --- js/build.js | 6 +-- js/build.templates.js | 118 +++++++++++++++++++++--------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/js/build.js b/js/build.js index a83e151..9c38e21 100644 --- a/js/build.js +++ b/js/build.js @@ -2354,9 +2354,9 @@ Fliplet().then(function() { var isFriendAvatar = friend ? friend.data[avatarColumnName] : ''; conversation.isChannel = conversation.definition.group && conversation.definition.group.public; - conversation.name = participants.length >= 2 || conversation.isChannel ? conversation.name || 'Group' : conversationName; - conversation.avatar = participants.length >= 2 ? '' : isFriendAvatar; - conversation.isGroup = !conversation.isChannel && participants.length >= 2; + conversation.isGroup = !conversation.isChannel && (participants.length > 2 || (conversation.definition.removedParticipants && conversation.definition.removedParticipants.length > 0)); + conversation.name = conversation.isGroup ? conversation.name || 'Group' : conversationName; + conversation.avatar = participants.length > 2 ? '' : isFriendAvatar; conversation.usersInConversation = conversationName; conversation.nParticipants = participants.length; conversation.absoluteTime = TD(conversation.updatedAt, { format: 'fromNow' }); diff --git a/js/build.templates.js b/js/build.templates.js index 21a47d4..f31c1b1 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -1,113 +1,113 @@ this["Fliplet"] = this["Fliplet"] || {}; this["Fliplet"]["Widget"] = this["Fliplet"]["Widget"] || {}; -this["Fliplet"]["Widget"]["Templates"] = this["Fliplet"]["Widget"]["Templates"] || {}; - +this["Fliplet"]["Widget"]["Templates"] = this["Fliplet"]["Widget"]["Templates"] || {}; + this["Fliplet"]["Widget"]["Templates"]["templates.admin-button-group"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3=container.escapeExpression; - return "
\r\n

" + return "

\n

" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.adminButtonGroup.title",{"name":"T","hash":{},"data":data})) - + "

\r\n
\r\n
\r\n
" + + "

\n
\n
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.adminButtonGroup.actions.all",{"name":"T","hash":{},"data":data})) - + "
\r\n
" + + "
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.adminButtonGroup.actions.speakers",{"name":"T","hash":{},"data":data})) - + "
\r\n
" + + "
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.adminButtonGroup.actions.admins",{"name":"T","hash":{},"data":data})) - + "
\r\n
\r\n"; -},"useData":true}); - + + "
\n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.chat-header"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n
\r\n \r\n \r\n
\r\n
\r\n
{{ name }}
\r\n {{#unless definition.group.readOnly}}\r\n {{#if isGroup}}\r\n
{{ usersInConversation }}
\r\n {{/if}}\r\n {{#if isChannel}}\r\n
{{ nParticipants }}
\r\n {{/if}}\r\n {{/unless}}\r\n
\r\n
\r\n{{#if isMuted}}\r\n \r\n{{else}}\r\n \r\n{{/if}}\r\n
\r\n"; -},"useData":true}); - + return "
\n
\n \n \n
\n
\n
{{ name }}
\n {{#unless definition.group.readOnly}}\n {{#if isGroup}}\n
{{ usersInConversation }}
\n {{/if}}\n {{#if isChannel}}\n
{{ nParticipants }}
\n {{/if}}\n {{/unless}}\n
\n
\n{{#if isMuted}}\n \n{{else}}\n \n{{/if}}\n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.contacts-list"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#each this}}\r\n
{{ @key }}
\r\n {{#each this}}\r\n
\r\n
\r\n {{#if image}}\r\n
\r\n {{/if}}\r\n {{#if isChannel}}\r\n \r\n {{else}}\r\n \r\n {{/if}}\r\n
\r\n
\r\n
{{ fullName }}
\r\n
\r\n
{{{ title }}}
\r\n
\r\n
\r\n {{#if isPinned}}\r\n
\r\n {{/if}}\r\n
\r\n {{/each}}\r\n{{/each}}"; -},"useData":true}); - + return "{{#each this}}\n
{{ @key }}
\n {{#each this}}\n
\n
\n {{#if image}}\n
\n {{/if}}\n {{#if isChannel}}\n \n {{else}}\n \n {{/if}}\n
\n
\n
{{ fullName }}
\n
\n
{{{ title }}}
\n
\n
\n {{#if isPinned}}\n
\n {{/if}}\n
\n {{/each}}\n{{/each}}"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.conversation-content"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3=container.escapeExpression; return "
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.conversation.offline",{"name":"T","hash":{},"data":data})) - + "
\r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n {{ name }}\r\n
\r\n
\r\n\r\n
\r\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n \n
\n {{ name }}\n
\n
\n\n
\n \r\n
\r\n
\r\n\r\n
\r\n
" + + "\n
\n
\n\n
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.conversation.errors.sendFailed",{"name":"T","hash":{},"data":data})) - + "
\r\n
" + + "
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.conversation.sendTo",{"name":"T","hash":{},"data":data})) - + ": {{ name }}
\r\n
\r\n \r\n
\r\n
\n
\n \n
\n \r\n
\r\n
\r\n"; -},"useData":true}); - + + " \n
\n \n
\n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.conversation-item"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n
\r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
{{ name }}
\r\n
\r\n {{#unless definition.group.readOnly}}\r\n {{#if isGroup}}\r\n
{{ usersInConversation }}
\r\n {{/if}}\r\n {{#if isChannel}}\r\n
{{ nParticipants }}
\r\n {{/if}}\r\n {{/unless}}\r\n {{#with lastMessage}}\r\n
{{ body }}
\r\n {{/with}}\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n {{#if isMuted}}\r\n \r\n {{else}}\r\n \r\n {{/if}}\r\n
\r\n
\r\n {{#if isGroup}}\r\n \r\n {{else}}\r\n {{#if isChannel}}\r\n \r\n {{else}}\r\n \r\n {{/if}}\r\n {{/if}}\r\n
\r\n
\r\n
\r\n
\r\n"; -},"useData":true}); - + return "
\n
\n
\n
\n \n \n
\n
\n
{{ name }}
\n
\n {{#unless definition.group.readOnly}}\n {{#if isGroup}}\n
{{ usersInConversation }}
\n {{/if}}\n {{#if isChannel}}\n
{{ nParticipants }}
\n {{/if}}\n {{/unless}}\n {{#with lastMessage}}\n
{{ body }}
\n {{/with}}\n
\n
\n
\n
\n
\n
\n
\n
\n
\n {{#if isMuted}}\n \n {{else}}\n \n {{/if}}\n
\n
\n {{#if isGroup}}\n \n {{else}}\n {{#if isChannel}}\n \n {{else}}\n \n {{/if}}\n {{/if}}\n
\n
\n
\n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.conversations-group"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#each this}}\r\n
\r\n {{ @key }}\r\n
\r\n {{#each this}}\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n
\r\n
\r\n
{{ name }}
\r\n
\r\n {{#unless definition.group.readOnly}}\r\n {{#if isGroup}}\r\n
{{ usersInConversation }}
\r\n {{/if}}\r\n {{#if isChannel}}\r\n
{{ nParticipants }}
\r\n {{/if}}\r\n {{/unless}}\r\n {{#with lastMessage}}\r\n
{{ body }}
\r\n {{/with}}\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n {{#if isMuted}}\r\n \r\n {{else}}\r\n \r\n {{/if}}\r\n
\r\n
\r\n {{#if isGroup}}\r\n \r\n {{else}}\r\n {{#if isChannel}}\r\n \r\n {{else}}\r\n \r\n {{/if}}\r\n {{/if}}\r\n
\r\n
\r\n
\r\n
\r\n {{/each}}\r\n
\r\n
\r\n{{/each}}\r\n"; -},"useData":true}); - + return "{{#each this}}\n
\n {{ @key }}\n
\n {{#each this}}\n
\n
\n
\n
\n \n \n
\n
\n
{{ name }}
\n
\n {{#unless definition.group.readOnly}}\n {{#if isGroup}}\n
{{ usersInConversation }}
\n {{/if}}\n {{#if isChannel}}\n
{{ nParticipants }}
\n {{/if}}\n {{/unless}}\n {{#with lastMessage}}\n
{{ body }}
\n {{/with}}\n
\n
\n
\n
\n
\n
\n
\n
\n
\n {{#if isMuted}}\n \n {{else}}\n \n {{/if}}\n
\n
\n {{#if isGroup}}\n \n {{else}}\n {{#if isChannel}}\n \n {{else}}\n \n {{/if}}\n {{/if}}\n
\n
\n
\n
\n {{/each}}\n
\n
\n{{/each}}\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.group-contacts-template"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#each this}}\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
{{ userName }}
\r\n
\r\n
{{ userTitle }}
\r\n
\r\n
\r\n {{#if pinned}}\r\n
\r\n {{/if}}\r\n
\r\n{{/each}}"; -},"useData":true}); - + return "{{#each this}}\n
\n
\n
\n \n
\n
\n
{{ userName }}
\n
\n
{{ userTitle }}
\n
\n
\n {{#if pinned}}\n
\n {{/if}}\n
\n{{/each}}"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.group-tabs"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3=container.escapeExpression; - return "
\r\n \n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.message-gap"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { return "
"; -},"useData":true}); - +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.message-item"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3=container.escapeExpression; - return "
\r\n
\r\n
\r\n
{{ timeAgo }}
\r\n
\r\n
\r\n
\r\n \r\n " + return "
\n
\n
\n
{{ timeAgo }}
\n
\n
\n
\n \n " + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.message.actions.copy",{"name":"T","hash":{},"data":data})) - + "\r\n
\r\n {{#if isFromCurrentUser}}\r\n
\r\n \r\n " + + "\n
\n {{#if isFromCurrentUser}}\n
\n \n " + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.message.actions.edit",{"name":"T","hash":{},"data":data})) - + "\r\n
\r\n
\r\n \r\n " + + "\n
\n
\n \n " + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.message.actions.delete",{"name":"T","hash":{},"data":data})) - + "\r\n
\r\n {{/if}}\r\n
\r\n
\r\n
\r\n {{#unless isFromCurrentUser}}\r\n {{#if isFromGroup}}\r\n
{{ name }}
\r\n {{/if}}\r\n {{#if isFromChannel}}\r\n
{{ name }}
\r\n {{/if}}\r\n {{/unless}}\r\n {{#if message.fileType}}\r\n
\r\n
" + + "\n
\n {{/if}}\n
\n
\n
\n {{#unless isFromCurrentUser}}\n {{#if isFromGroup}}\n
{{ name }}
\n {{/if}}\n {{#if isFromChannel}}\n
{{ name }}
\n {{/if}}\n {{/unless}}\n {{#if message.fileType}}\n
\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.message.errors.offline",{"name":"T","hash":{},"data":data})) - + "
\r\n \r\n
\r\n {{/if}}\r\n
\r\n {{ formatMessage message.body }}\r\n
\r\n {{#if message.isEdited}}\r\n
" + + "
\n \n
\n {{/if}}\n
\n {{ formatMessage message.body }}\n
\n {{#if message.isEdited}}\n
" + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.message.editSuccess",{"name":"T","hash":{},"data":data})) - + "
\r\n {{/if}}\r\n
\r\n
\r\n"; -},"useData":true}); - + + "
\n {{/if}}\n
\n
\n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.message-queue"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
\r\n
\r\n \r\n
\r\n
\r\n {{#if message.fileType}}\r\n
\r\n
" + return "
\n
\n \n
\n
\n {{#if message.fileType}}\n
\n
" + container.escapeExpression((helpers.T || (depth0 && depth0.T) || helpers.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"widgets.chat.message.errors.offline",{"name":"T","hash":{},"data":data})) - + "
\r\n \r\n
\r\n {{/if}}\r\n
\r\n {{ formatMessage message.body }}\r\n
\r\n
\r\n
"; -},"useData":true}); - + + "
\n \n
\n {{/if}}\n
\n {{ formatMessage message.body }}\n
\n
\n
"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.new-conversation"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; - return "
  • \r\n \n " + alias4(((helper = (helper = helpers.fullName || (depth0 != null ? depth0.fullName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"fullName","hash":{},"data":data}) : helper))) - + "\r\n
    • \r\n"; + + "\n \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3=container.escapeExpression; - return "
    \r\n

    " + return "
    \n

    " + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.conversation.newConversation.title",{"name":"T","hash":{},"data":data})) - + "

    \r\n

    " + + "

    \n

    " + alias3((helpers.T || (depth0 && depth0.T) || alias2).call(alias1,"widgets.chat.conversation.newConversation.instruction",{"name":"T","hash":{},"data":data})) - + "

    \r\n\r\n
      \r\n" + + "

      \n\n
        \n" + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.contacts : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
      \r\n
    \r\n"; -},"useData":true}); - + + "\n
    \n"; +},"useData":true}); + this["Fliplet"]["Widget"]["Templates"]["templates.select-contact-bubble"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "
    \r\n
    \r\n
    \r\n \r\n \r\n
    \r\n
    {{ userName }}
    \r\n
    "; + return "
    \n
    \n
    \n \n \n
    \n
    {{ userName }}
    \n
    "; },"useData":true}); \ No newline at end of file