Skip to content

Commit

Permalink
refactor: Convert function names to camelCase (#10655)
Browse files Browse the repository at this point in the history
  • Loading branch information
ffflorian committed Mar 5, 2021
1 parent 0c48f17 commit c9e81ea
Show file tree
Hide file tree
Showing 80 changed files with 699 additions and 704 deletions.
8 changes: 4 additions & 4 deletions src/page/template/content/collection-details.htm
Expand Up @@ -17,18 +17,18 @@
<header class="collection-date-separator" data-bind="text: $parent.getTitleForHeader(messageEntity)"></header>
<!-- /ko -->
<!-- ko if: messageEntity.category & $parent.MessageCategory.IMAGE -->
<image-component params="className: 'collection-image', asset: messageEntity.get_first_asset().resource, click: function() {$parent.clickOnImage(messageEntity)}"></image-component>
<image-component params="className: 'collection-image', asset: messageEntity.getFirstAsset().resource, click: function() {$parent.clickOnImage(messageEntity)}"></image-component>
<!-- /ko -->
<!-- ko if: messageEntity.category & $parent.MessageCategory.LINK -->
<link-preview-asset params="message: messageEntity, header: true"></link-preview-asset>
<!-- /ko -->
<!-- ko if: messageEntity.get_first_asset().is_file() -->
<!-- ko if: messageEntity.getFirstAsset().isFile() -->
<file-asset class="collection-file" params="message: messageEntity, header: true"></file-asset>
<!-- /ko -->
<!-- ko if: messageEntity.get_first_asset().is_audio() -->
<!-- ko if: messageEntity.getFirstAsset().isAudio() -->
<audio-asset class="collection-file" params="message: messageEntity, header: true"></audio-asset>
<!-- /ko -->
<!-- ko if: messageEntity.get_first_asset().is_video() -->
<!-- ko if: messageEntity.getFirstAsset().isVideo() -->
<file-asset class="collection-file" params="message: messageEntity, header: true"></file-asset>
<!-- /ko -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/page/template/content/collection.htm
Expand Up @@ -26,7 +26,7 @@
<!-- /ko -->
</header>
<div class="collection-images" data-bind="foreach: {data: images.slice(0, 12), as: 'messageEntity'}">
<image-component params="className: 'collection-image', asset: messageEntity.get_first_asset().resource, click: function() {$parent.clickOnImage(messageEntity)}"></image-component>
<image-component params="className: 'collection-image', asset: messageEntity.getFirstAsset().resource, click: function() {$parent.clickOnImage(messageEntity)}"></image-component>
</div>
</section>
<!-- /ko -->
Expand Down
12 changes: 6 additions & 6 deletions src/page/template/content/conversation/input-bar.htm
Expand Up @@ -14,38 +14,38 @@
<!-- /ko -->
</div>
<!-- ko if: replyAsset() -->
<!-- ko if: replyAsset().is_text() -->
<!-- ko if: replyAsset().isText() -->
<div class="input-bar__reply__message input-bar__reply__message__text" data-bind="html: renderMessage(replyAsset().text, null, replyAsset().mentions())" data-uie-name="media-text-reply-box"></div>
<!-- /ko -->

<!-- ko if: replyAsset().is_image()-->
<!-- ko if: replyAsset().isImage()-->
<div class="input-bar__reply__message input-bar__reply__message__image" data-bind="background_image: replyAsset().resource()" data-uie-name="media-picture-reply-box">
<img/>
</div>
<!-- /ko -->

<!-- ko if: replyAsset().is_video() -->
<!-- ko if: replyAsset().isVideo() -->
<div class="input-bar__reply__message input-bar__reply__message__image input-bar__reply__video" data-bind="background_image: replyAsset().preview_resource()" data-uie-name="media-video-reply-box">
<img/>
<camera-icon></camera-icon>
</div>
<!-- /ko -->

<!-- ko if: replyAsset().is_audio()-->
<!-- ko if: replyAsset().isAudio()-->
<div class="input-bar__reply__message" data-uie-name="media-audio-reply-box">
<mic-on-icon class="input-bar__reply__icon"></mic-on-icon>
<span data-bind="text: t('replyAudioMessage')"></span>
</div>
<!-- /ko -->

<!-- ko if: replyAsset().is_file()-->
<!-- ko if: replyAsset().isFile()-->
<div class="input-bar__reply__message" data-uie-name="media-file-reply-box">
<file-icon class="input-bar__reply__icon"></file-icon>
<span data-bind="text: replyAsset().file_name"></span>
</div>
<!-- /ko -->

<!-- ko if: replyAsset().is_location()-->
<!-- ko if: replyAsset().isLocation()-->
<div class="input-bar__reply__message" data-uie-name="media-location-reply-box">
<location-icon class="input-bar__reply__icon"></location-icon>
<span data-bind="text: replyAsset().name"></span>
Expand Down
4 changes: 2 additions & 2 deletions src/page/template/content/conversation/message-list.htm
Expand Up @@ -7,7 +7,7 @@
attr: {'data-uie-uid': message.id, 'data-uie-value': message.super_type, 'data-uie-expired-status': message.ephemeral_expires, 'data-uie-send-status': message.status}"
data-uie-name="item-message">

<div class="message-header message-timestamp" data-bind="css: get_timestamp_class(message)">
<div class="message-header message-timestamp" data-bind="css: getTimestampClass(message)">
<div class="message-header-icon">
<span class="message-unread-dot"></span>
</div>
Expand All @@ -30,7 +30,7 @@
messageRepository: messageRepository,
onContentUpdated: adjustScroll,
onClickAvatar: showUserDetails,
onClickImage: show_detail,
onClickImage: showDetail,
onClickInvitePeople: clickOnInvitePeople,
onClickMessage: handleClickOnMessage,
onClickTimestamp: focusMessage,
Expand Down
2 changes: 1 addition & 1 deletion src/page/template/detail-view.htm
Expand Up @@ -24,7 +24,7 @@
<span data-bind="text: t('conversationContextMenuReply')"></span>
</span>
<!-- /ko -->
<!-- ko if: messageEntity().is_downloadable() -->
<!-- ko if: messageEntity().isDownloadable() -->
<span class="detail-view-action-button" data-bind="click: clickOnDownload" data-uie-name="do-download-fullscreen-picture">
<span class="icon-download"></span>
<span data-bind="text: t('conversationContextMenuDownload')"></span>
Expand Down
2 changes: 1 addition & 1 deletion src/page/template/list/archive.htm
Expand Up @@ -9,7 +9,7 @@
<conversation-list-cell
data-bind="click: () => clickOnConversation(conversation), event: {'contextmenu': (_, event) => listViewModel.onContextMenu(conversation, event)}"
data-uie-name="item-conversation-archived"
params="click: listViewModel.onContextMenu, conversation: conversation, onJoinCall: onJoinCall">
params="rightClick: listViewModel.onContextMenu, conversation: conversation, onJoinCall: onJoinCall">
</conversation-list-cell>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/page/template/list/conversations.htm
Expand Up @@ -90,7 +90,7 @@
<conversation-list-cell
data-bind="link_to: getConversationUrl(conversation.id), event: {'contextmenu': (_, event) => listViewModel.onContextMenu(conversation, event)}"
data-uie-name="item-conversation"
params="click: (_, event) => listViewModel.onContextMenu(conversation, event), conversation: conversation, showJoinButton: hasJoinableCall(conversation.id), is_selected: isSelectedConversation, onJoinCall: onJoinCall, index: $index, isVisibleFunc: isVisibleFunc"
params="rightClick: (_, event) => listViewModel.onContextMenu(conversation, event), conversation: conversation, showJoinButton: hasJoinableCall(conversation.id), is_selected: isSelectedConversation, onJoinCall: onJoinCall, index: $index, isVisibleFunc: isVisibleFunc"
>
</conversation-list-cell>
<!-- /ko -->
Expand Down
2 changes: 1 addition & 1 deletion src/script/backup/BackupRepository.ts
Expand Up @@ -272,7 +272,7 @@ export class BackupRepository {
await this.importHistoryEvents(eventEntities, progressCallback);
await this.conversationRepository.updateConversations(importedEntities);
await Promise.all(
this.conversationRepository.map_connections(Object.values(this.connectionState.connectionEntities())),
this.conversationRepository.mapConnections(Object.values(this.connectionState.connectionEntities())),
);
// doesn't need to be awaited
void this.conversationRepository.checkForDeletedConversations();
Expand Down
4 changes: 2 additions & 2 deletions src/script/calling/CallingRepository.ts
Expand Up @@ -252,7 +252,7 @@ export class CallingRepository {
await this.apiClient.conversation.api.postOTRMessage(this.selfClientId, conversationId);
} catch (error) {
const mismatch: ClientMismatch = (error as AxiosError).response!.data;
const localClients: UserClients = await this.messageRepository.create_recipients(conversationId);
const localClients: UserClients = await this.messageRepository.createRecipients(conversationId);

const makeClientList = (recipients: UserClients): ClientListEntry[] =>
Object.entries(recipients).reduce(
Expand Down Expand Up @@ -485,7 +485,7 @@ export class CallingRepository {
//##############################################################################

private async verificationPromise(conversationId: string, userId: string, isResponse: boolean): Promise<void> {
const recipients = await this.messageRepository.create_recipients(conversationId, false, [userId]);
const recipients = await this.messageRepository.createRecipients(conversationId, false, [userId]);
const eventInfoEntity = new EventInfoEntity(undefined, conversationId, {recipients});
eventInfoEntity.setType(GENERIC_MESSAGE_TYPE.CALLING);
const consentType = isResponse
Expand Down
2 changes: 1 addition & 1 deletion src/script/client/ClientRepository.ts
Expand Up @@ -291,7 +291,7 @@ export class ClientRepository {
async deleteClient(clientId: string, password: string): Promise<ClientEntity[]> {
await this.clientService.deleteClient(clientId, password);
await this.deleteClientFromDb(this.selfUser().id, clientId);
this.selfUser().remove_client(clientId);
this.selfUser().removeClient(clientId);
amplify.publish(WebAppEvents.USER.CLIENT_REMOVED, this.selfUser().id, clientId);
return this.clientState.clients();
}
Expand Down
Expand Up @@ -39,7 +39,7 @@ export abstract class AbstractAssetTransferStateTracker {
this.AssetTransferState = AssetTransferState;

this.transferState = ko.pureComputed(() => {
const asset = message?.get_first_asset() as FileAsset;
const asset = message?.getFirstAsset() as FileAsset;
const status = this.uploadProgress() > -1 ? AssetTransferState.UPLOADING : asset?.status();
return status;
});
Expand Down
2 changes: 1 addition & 1 deletion src/script/components/asset/audioAsset.ts
Expand Up @@ -51,7 +51,7 @@ class AudioAssetComponent extends AbstractAssetTransferStateTracker {
this.logger = getLogger('AudioAssetComponent');

this.message = ko.unwrap(message);
this.asset = this.message.get_first_asset() as FileAsset;
this.asset = this.message.getFirstAsset() as FileAsset;
this.header = header;

this.audioSrc = ko.observable();
Expand Down
2 changes: 1 addition & 1 deletion src/script/components/asset/fileAsset.ts
Expand Up @@ -54,7 +54,7 @@ class FileAssetComponent {
this.assetRepository = container.resolve(AssetRepository);

this.uploadProgress = this.assetRepository.getUploadProgress(this.message.id);
this.asset = this.message.get_first_asset() as FileAsset;
this.asset = this.message.getFirstAsset() as FileAsset;
this.header = header;
this.formattedFileSize = formatBytes(parseInt(this.asset.file_size, 10));
this.fileName = trimFileExtension(this.asset.file_name);
Expand Down
6 changes: 3 additions & 3 deletions src/script/components/asset/linkPreviewAsset.ts
Expand Up @@ -50,21 +50,21 @@ class LinkPreviewAssetComponent {
this.messageEntity = ko.unwrap(message);
this.header = header;

const [firstPreview] = (this.messageEntity.get_first_asset() as Text).previews();
const [firstPreview] = (this.messageEntity.getFirstAsset() as Text).previews();
this.preview = firstPreview;
this.element = element;

const isTypeTweet = this.preview && this.preview.meta_data_type === LinkPreviewMetaDataType.TWEET;
this.isTweet = isTypeTweet && isTweetUrl(this.preview.url);
this.author = this.isTweet ? this.preview.meta_data.author.substring(0, 20) : '';

if (!this.messageEntity.is_expired()) {
if (!this.messageEntity.isExpired()) {
this.element.addEventListener('click', this.onClick);
}
}

readonly onClick = () => {
if (!this.messageEntity.is_expired()) {
if (!this.messageEntity.isExpired()) {
safeWindowOpen(this.preview.url);
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/script/components/asset/videoAsset.ts
Expand Up @@ -51,7 +51,7 @@ class VideoAssetComponent extends AbstractAssetTransferStateTracker {
this.logger = getLogger('VideoAssetComponent');

this.message = ko.unwrap(message);
this.asset = this.message.get_first_asset() as FileAsset;
this.asset = this.message.getFirstAsset() as FileAsset;

this.videoElement = element.querySelector('video');
this.videoSrc = ko.observable();
Expand Down
12 changes: 6 additions & 6 deletions src/script/components/list/conversationListCell.ts
Expand Up @@ -33,20 +33,20 @@ import 'Components/AvailabilityState';
import type {User} from '../../entity/User';

interface ConversationListCellProps {
click: () => void;
conversation: Conversation;
index: ko.Observable<number>;
is_selected: (conversation: Conversation) => boolean;
isVisibleFunc: (top: number, bottom: number) => boolean;
offsetTop: ko.Observable<number>;
onJoinCall: (conversation: Conversation, mediaType: MediaType) => void;
rightClick: () => void;
showJoinButton: boolean;
}

class ConversationListCell {
conversation: Conversation;
isSelected: ko.Computed<boolean>;
on_click: () => void;
rightClick: () => void;
AVATAR_SIZE: typeof AVATAR_SIZE;
showJoinButton: boolean;
isGroup: boolean;
Expand All @@ -58,13 +58,14 @@ class ConversationListCell {
ConversationStatusIcon: typeof ConversationStatusIcon;
onClickJoinCall: (viewModel: ConversationListCell, event: MouseEvent) => void;
dispose: () => void;

constructor(
{
showJoinButton,
conversation,
onJoinCall,
is_selected = () => false,
click = noop,
rightClick = noop,
index = ko.observable(0),
isVisibleFunc = () => false,
offsetTop = ko.observable(0),
Expand All @@ -73,8 +74,7 @@ class ConversationListCell {
) {
this.conversation = conversation;
this.isSelected = ko.computed(() => is_selected(conversation));
// TODO: "click" should be renamed to "right_click"
this.on_click = click;
this.rightClick = rightClick;
this.AVATAR_SIZE = AVATAR_SIZE;
this.showJoinButton = showJoinButton;
this.isGroup = conversation.isGroup();
Expand Down Expand Up @@ -157,7 +157,7 @@ ko.components.register('conversation-list-cell', {
<span class="conversation-list-cell-description" data-bind="text: cell_state().description" data-uie-name="secondary-line"></span>
</div>
<div class="conversation-list-cell-right">
<span class="conversation-list-cell-context-menu" data-bind="click: (_, event) => on_click(conversation, event)" data-uie-name="go-options"></span>
<span class="conversation-list-cell-context-menu" data-bind="click: (_, event) => rightClick(conversation, event)" data-uie-name="go-options"></span>
<!-- ko ifnot: showJoinButton -->
<!-- ko if: cell_state().icon === ConversationStatusIcon.PENDING_CONNECTION -->
<span class="conversation-list-cell-badge cell-badge-dark" data-uie-name="status-pending"><pending-icon class="svg-icon"></pending-icon></span>
Expand Down
2 changes: 1 addition & 1 deletion src/script/components/list/groupedConversations.ts
Expand Up @@ -53,7 +53,7 @@ ko.components.register('grouped-conversations', {
<conversation-list-cell
data-bind="link_to: getConversationUrl(conversation.id), event: {'contextmenu': (_, event) => listViewModel.onContextMenu(conversation, event)}"
data-uie-name="item-conversation"
params="click: (_, event) => listViewModel.onContextMenu(conversation, event), conversation: conversation, showJoinButton: hasJoinableCall(conversation.id), is_selected: isSelectedConversation, onJoinCall: onJoinCall,offsetTop: getOffsetTop(folder, conversation), index: $index, isVisibleFunc: isVisibleFunc">
params="rightClick: (_, event) => listViewModel.onContextMenu(conversation, event), conversation: conversation, showJoinButton: hasJoinableCall(conversation.id), is_selected: isSelectedConversation, onJoinCall: onJoinCall,offsetTop: getOffsetTop(folder, conversation), index: $index, isVisibleFunc: isVisibleFunc">
</conversation-list-cell>
<!-- /ko -->
</div>
Expand Down

0 comments on commit c9e81ea

Please sign in to comment.