Chocobozzz/PeerTube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-08 22:53:22 +03:00
Code Issues Projects Releases Wiki Activity

Clearer public email if email is not verified

Browse Source
This commit is contained in:
Chocobozzz 2024-03-08 11:22:23 +01:00
parent 10e78bb778
commit 7e573616d9
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
8 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
View File

@ -687,9 +687,9 @@
<label for="servicesTwitterUsername" i18n>Your Twitter/X username</label>
<div class="label-small-info">
<p class="mb-0">Indicates the Twitter/X account for the website or platform where the content was published.</p>
<p i18n class="mb-0">Indicates the Twitter/X account for the website or platform where the content was published.</p>
<p>This is just an extra information injected in PeerTube HTML that is required by Twitter/X. If you don't have a Twitter/X account, just leave the default value.</p>
<p i18n>This is just an extra information injected in PeerTube HTML that is required by Twitter/X. If you don't have a Twitter/X account, just leave the default value.</p>
</div>
<input

2
client/src/app/+admin/moderation/registration-list/registration-list.component.html
View File

@ -74,7 +74,7 @@
</td>
<td>
<my-user-email-info [entry]="registration" [requiresEmailVerification]="requiresEmailVerification"></my-user-email-info>
<my-user-email-info [entry]="registration" [showEmailVerifyInformation]="requiresEmailVerification"></my-user-email-info>
</td>
<td>

2
client/src/app/+admin/overview/users/user-list/user-list.component.html
View File

@ -114,7 +114,7 @@
</td>
<td *ngIf="isSelected('email')">
<my-user-email-info [entry]="user" [requiresEmailVerification]="requiresEmailVerification"></my-user-email-info>
<my-user-email-info [entry]="user" showEmailVerifyInformation="true"></my-user-email-info>
</td>
<td *ngIf="isSelected('quota')">

16
client/src/app/+admin/shared/user-email-info.component.html
View File

@ -1,13 +1,13 @@
<ng-container>
<a [href]="'mailto:' + entry.email" [title]="getTitle()">
<ng-container *ngIf="!requiresEmailVerification">
@if (showEmailVerifyInformation) {
@if (entry.emailVerified === true) {
&#x2713; {{ entry.email }}
} @else {
<em *ngIf="!entry.emailVerified">? {{ entry.email }}</em>
}
} @else {
{{ entry.email }}
</ng-container>
<ng-container *ngIf="requiresEmailVerification">
<em *ngIf="!entry.emailVerified">? {{ entry.email }}</em>
<ng-container *ngIf="entry.emailVerified === true">&#x2713; {{ entry.email }}</ng-container>
</ng-container>
}
</a>
</ng-container>

4
client/src/app/+admin/shared/user-email-info.component.ts
View File

@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core'
import { Component, Input, booleanAttribute } from '@angular/core'
import { User, UserRegistration } from '@peertube/peertube-models'
import { NgIf } from '@angular/common'
@ -11,7 +11,7 @@ import { NgIf } from '@angular/common'
})
export class UserEmailInfoComponent {
@Input() entry: User | UserRegistration
@Input() requiresEmailVerification: boolean
@Input({ transform: booleanAttribute }) showEmailVerifyInformation: boolean
getTitle () {
if (this.entry.emailVerified) {

13
client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts
View File

@ -1,14 +1,14 @@
import { forkJoin } from 'rxjs'
import { tap } from 'rxjs/operators'
import { NgClass, NgIf } from '@angular/common'
import { Component, OnInit } from '@angular/core'
import { AuthService, Notifier, ServerService, UserService } from '@app/core'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { AuthService, ServerService, UserService } from '@app/core'
import { USER_EMAIL_VALIDATOR, USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators'
import { FormReactive } from '@app/shared/shared-forms/form-reactive'
import { FormReactiveService } from '@app/shared/shared-forms/form-reactive.service'
import { HttpStatusCode, User } from '@peertube/peertube-models'
import { forkJoin } from 'rxjs'
import { tap } from 'rxjs/operators'
import { InputTextComponent } from '../../../shared/shared-forms/input-text.component'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { NgIf, NgClass } from '@angular/common'
@Component({
selector: 'my-account-change-email',
@ -26,8 +26,7 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni
protected formReactiveService: FormReactiveService,
private authService: AuthService,
private userService: UserService,
private serverService: ServerService,
private notifier: Notifier
private serverService: ServerService
) {
super()
}

8
client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.html
View File

@ -6,7 +6,13 @@
i18n-labelText labelText="Allow email to be publicly displayed"
>
<ng-container ngProjectAs="description">
<span i18n>Necessary to claim podcast RSS feeds.</span>
<p class="mb-0">
@if (user.emailVerified) {
<ng-container i18n>Necessary to claim podcast RSS feeds.</ng-container>
} @else {
<ng-container i18n>⚠️ Your email cannot be used in podcast RSS feeds because it has not yet been verified.</ng-container>
}
</p>
</ng-container>
</my-peertube-checkbox>
</div>

2
client/src/app/+my-account/my-account-settings/my-account-settings.component.html
View File

@ -7,7 +7,7 @@
<div class="content-col">
<my-actor-avatar-edit
class="d-block mb-3"
*ngIf="user?.account" class="d-block mb-3"
actorType="account" [avatars]="user.account.avatars"
[displayName]="user.account.displayName" [username]="user.username" [subscribers]="user.account.followersCount"
(avatarChange)="onAvatarChange($event)" (avatarDelete)="onAvatarDelete()"