Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

clean up

This commit is contained in:
Nicolas Constant 2020-05-22 02:34:08 -04:00
parent ab30bb1a06
commit 73c264e9e7
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 7 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/app/components/floating-column/manage-account/bookmarks/bookmarks.component.ts
View File

@ -1,13 +1,12 @@
import { Component, OnInit, Output, EventEmitter, Input, ViewChild, ElementRef } from '@angular/core';
import { Component, Input, ViewChild, ElementRef } from '@angular/core';
import { StatusWrapper } from '../../../../models/common.model';
import { OpenThreadEvent, ToolsService } from '../../../../services/tools.service';
import { ToolsService } from '../../../../services/tools.service';
import { AccountWrapper } from '../../../../models/account.models';
import { FavoriteResult, BookmarkResult } from '../../../../services/mastodon.service';
import { BookmarkResult } from '../../../../services/mastodon.service';
import { MastodonWrapperService } from '../../../../services/mastodon-wrapper.service';
import { Status } from '../../../../services/models/mastodon.interfaces';
import { NotificationService } from '../../../../services/notification.service';
import { TimeLineModeEnum } from '../../../../states/settings.state';
import { TimelineBase } from '../../../../components/common/timeline-base';
@Component({
@ -15,22 +14,7 @@ import { TimelineBase } from '../../../../components/common/timeline-base';
templateUrl: '../../../stream/stream-statuses/stream-statuses.component.html',
styleUrls: ['../../../stream/stream-statuses/stream-statuses.component.scss', './bookmarks.component.scss']
})
export class BookmarksComponent extends TimelineBase {
// statuses: StatusWrapper[] = [];
// displayError: string;
// isLoading = true;
// isThread = false;
// hasContentWarnings = false;
// bufferStream: Status[] = []; //html compatibility only
// streamPositionnedAtTop: boolean = true; //html compatibility only
// timelineLoadingMode: TimeLineModeEnum = TimeLineModeEnum.OnTop; //html compatibility only
// @Output() browseAccountEvent = new EventEmitter<string>();
// @Output() browseHashtagEvent = new EventEmitter<string>();
// @Output() browseThreadEvent = new EventEmitter<OpenThreadEvent>();
// private maxReached = false;
export class BookmarksComponent extends TimelineBase {
private maxId: string;
private _accountWrapper: AccountWrapper;
@ -87,42 +71,6 @@ export class BookmarksComponent extends TimelineBase {
});
}
// onScroll() {
// var element = this.statustream.nativeElement as HTMLElement;
// const atBottom = element.scrollHeight <= element.clientHeight + element.scrollTop + 1000;
// if (atBottom) {
// this.scrolledToBottom();
// }
// }
// private scrolledToBottom() {
// if (this.isLoading || this.maxReached) return;
// this.isLoading = true;
// this.mastodonService.getBookmarks(this.account, this.maxId)
// .then((result: BookmarkResult) => {
// const statuses = result.bookmarked;
// if (statuses.length === 0 || !this.maxId) {
// this.maxReached = true;
// return;
// }
// this.maxId = result.max_id;
// for (const s of statuses) {
// let cwPolicy = this.toolsService.checkContentWarning(s);
// const wrapper = new StatusWrapper(cwPolicy.status, this.account, cwPolicy.applyCw, cwPolicy.hide);
// this.statuses.push(wrapper);
// }
// })
// .catch(err => {
// this.notificationService.notifyHttpError(err, this.account);
// })
// .then(() => {
// this.isLoading = false;
// });
// }
protected getNextStatuses(): Promise<Status[]> {
return this.mastodonService.getBookmarks(this.account, this.maxId)
.then((result: BookmarkResult) => {
@ -140,27 +88,4 @@ export class BookmarksComponent extends TimelineBase {
protected scrolledToTop() {}
protected statusProcessOnGoToTop(){}
// browseAccount(accountName: string): void {
// this.browseAccountEvent.next(accountName);
// }
// browseHashtag(hashtag: string): void {
// this.browseHashtagEvent.next(hashtag);
// }
// browseThread(openThreadEvent: OpenThreadEvent): void {
// this.browseThreadEvent.next(openThreadEvent);
// }
// applyGoToTop(): boolean {
// const stream = this.statustream.nativeElement as HTMLElement;
// setTimeout(() => {
// stream.scrollTo({
// top: 0,
// behavior: 'smooth'
// });
// }, 0);
// return false;
// }
}

146
src/app/components/stream/stream-statuses/stream-statuses.component.ts
View File

@ -1,15 +1,15 @@
import { Component, OnInit, Input, ViewChild, ElementRef, OnDestroy, EventEmitter, Output, ViewChildren, QueryList } from '@angular/core';
import { Component, Input } from '@angular/core';
import { HttpErrorResponse } from '@angular/common/http';
import { Observable, Subscription } from 'rxjs';
import { Store } from '@ngxs/store';
import { StreamElement } from '../../../states/streams.state';
import { AccountInfo } from '../../../states/accounts.state';
import { StreamingService, EventEnum, StreamingWrapper, StatusUpdate } from '../../../services/streaming.service';
import { StreamingService, EventEnum, StatusUpdate } from '../../../services/streaming.service';
import { Status } from '../../../services/models/mastodon.interfaces';
import { MastodonWrapperService } from '../../../services/mastodon-wrapper.service';
import { NotificationService } from '../../../services/notification.service';
import { OpenThreadEvent, ToolsService } from '../../../services/tools.service';
import { ToolsService } from '../../../services/tools.service';
import { StatusWrapper } from '../../../models/common.model';
import { TimeLineModeEnum } from '../../../states/settings.state';
import { TimelineBase } from '../../common/timeline-base';
@ -19,52 +19,7 @@ import { TimelineBase } from '../../common/timeline-base';
templateUrl: './stream-statuses.component.html',
styleUrls: ['./stream-statuses.component.scss']
})
// export class StreamStatusesComponent implements OnInit, OnDestroy {
export class StreamStatusesComponent extends TimelineBase {
// isLoading = true;
// private lastInfinityFetchReturnedNothing = false;
// isThread = false;
// displayError: string;
// hasContentWarnings = false;
// timelineLoadingMode: TimeLineModeEnum;
// private _streamElement: StreamElement;
// private account: AccountInfo;
// private websocketStreaming: StreamingWrapper;
// statuses: StatusWrapper[] = [];
// bufferStream: Status[] = [];
// private bufferWasCleared: boolean;
// streamPositionnedAtTop: boolean = true;
// private isProcessingInfiniteScroll: boolean;
// private hideBoosts: boolean;
// private hideReplies: boolean;
// private hideBots: boolean;
// @Output() browseAccountEvent = new EventEmitter<string>();
// @Output() browseHashtagEvent = new EventEmitter<string>();
// @Output() browseThreadEvent = new EventEmitter<OpenThreadEvent>();
// @Input()
// set streamElement(streamElement: StreamElement) {
// this._streamElement = streamElement;
// this.hideBoosts = streamElement.hideBoosts;
// this.hideBots = streamElement.hideBots;
// this.hideReplies = streamElement.hideReplies;
// this.load(this._streamElement);
// }
// get streamElement(): StreamElement {
// return this._streamElement;
// }
// @Input() goToTop: Observable<void>;
// @Input() userLocked = true;
protected _streamElement: StreamElement;
@Input()
@ -215,50 +170,6 @@ export class StreamStatusesComponent extends TimelineBase {
}
}
// @ViewChild('statusstream') public statustream: ElementRef;
// private applyGoToTop(): boolean {
// // this.loadBuffer();
// if (this.statuses.length > 2 * this.streamingService.nbStatusPerIteration) {
// this.statuses.length = 2 * this.streamingService.nbStatusPerIteration;
// }
// const stream = this.statustream.nativeElement as HTMLElement;
// setTimeout(() => {
// stream.scrollTo({
// top: 0,
// behavior: 'smooth'
// });
// }, 0);
// return false;
// }
// onScroll() {
// var element = this.statustream.nativeElement as HTMLElement;
// const atBottom = element.scrollHeight <= element.clientHeight + element.scrollTop + 1000;
// const atTop = element.scrollTop === 0;
// this.streamPositionnedAtTop = false;
// if (atBottom && !this.isProcessingInfiniteScroll) {
// this.scrolledToBottom();
// } else if (atTop) {
// this.scrolledToTop();
// }
// }
// browseAccount(accountName: string): void {
// this.browseAccountEvent.next(accountName);
// }
// browseHashtag(hashtag: string): void {
// this.browseHashtagEvent.next(hashtag);
// }
// browseThread(openThreadEvent: OpenThreadEvent): void {
// this.browseThreadEvent.next(openThreadEvent);
// }
textSelected(): void {
console.warn(`status comp: textSelected`); //TODO
}
@ -291,38 +202,6 @@ export class StreamStatusesComponent extends TimelineBase {
return false;
}
// private scrolledToBottom() {
// if (this.isLoading || this.lastInfinityFetchReturnedNothing) return;
// this.isLoading = true;
// this.isProcessingInfiniteScroll = true;
// const lastStatus = this.statuses[this.statuses.length - 1];
// this.mastodonService.getTimeline(this.account, this._streamElement.type, lastStatus.status.id, null, this.streamingService.nbStatusPerIteration, this._streamElement.tag, this._streamElement.listId)
// .then((status: Status[]) => {
// for (const s of status) {
// if (this.isFiltered(s)) {
// continue;
// }
// let cwPolicy = this.toolsService.checkContentWarning(s);
// const wrapper = new StatusWrapper(cwPolicy.status, this.account, cwPolicy.applyCw, cwPolicy.hide);
// this.statuses.push(wrapper);
// }
// if (!status || status.length === 0) {
// this.lastInfinityFetchReturnedNothing = true;
// }
// })
// .catch((err: HttpErrorResponse) => {
// this.notificationService.notifyHttpError(err, this.account);
// })
// .then(() => {
// this.isLoading = false;
// this.isProcessingInfiniteScroll = false;
// });
// }
protected getNextStatuses(): Promise<Status[]> {
const lastStatus = this.statuses[this.statuses.length - 1];
@ -395,24 +274,5 @@ export class StreamStatusesComponent extends TimelineBase {
this.bufferStream.length = 2 * this.streamingService.nbStatusPerIteration;
}
}
// private isFiltered(status: Status): boolean {
// if (this.streamElement.hideBoosts) {
// if (status.reblog) {
// return true;
// }
// }
// if (this.streamElement.hideBots) {
// if (status.account.bot) {
// return true;
// }
// }
// if (this.streamElement.hideReplies) {
// if (status.in_reply_to_account_id && status.account.id !== status.in_reply_to_account_id) {
// return true;
// }
// }
// return false;
// }
}