diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-13 10:27:35 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-13 10:27:35 +0200 |
commit | 8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31 (patch) | |
tree | f589287acf41fe528ed47c10180415e3694a54e6 /pkgs | |
parent | 27b4bbf9ad21d511c5a2e96d0723f2a65e1118a1 (diff) | |
download | Nix-8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31.tar.gz Nix-8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31.tar.zst Nix-8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31.zip |
Add syden peertube website
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/webapps/peertube/default.nix | 10 | ||||
-rw-r--r-- | pkgs/webapps/peertube/syden.patch | 211 |
2 files changed, 216 insertions, 5 deletions
diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix index 7889cee..3642a44 100644 --- a/pkgs/webapps/peertube/default.nix +++ b/pkgs/webapps/peertube/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { ldap ? false, sendmail ? false, light ? null, runCommand, libsass | 1 | { ldap ? false, sendmail ? false, light ? null, syden ? false, runCommand, libsass |
2 | , lib, stdenv, rsync, fetchzip, youtube-dl, fetchurl, mylibs, python, nodejs, nodePackages, yarn2nix-moretea }: | 2 | , lib, stdenv, rsync, fetchzip, youtube-dl, fetchurl, mylibs, python, nodejs, nodePackages, yarn2nix-moretea }: |
3 | let | 3 | let |
4 | nodeHeaders = fetchurl { | 4 | nodeHeaders = fetchurl { |
@@ -8,7 +8,10 @@ let | |||
8 | source = mylibs.fetchedGithub ./peertube.json; | 8 | source = mylibs.fetchedGithub ./peertube.json; |
9 | patchedSource = stdenv.mkDerivation (source // rec { | 9 | patchedSource = stdenv.mkDerivation (source // rec { |
10 | phases = [ "unpackPhase" "patchPhase" "installPhase" ]; | 10 | phases = [ "unpackPhase" "patchPhase" "installPhase" ]; |
11 | patches = [ ./yarn_fix_http_node.patch ] ++ lib.optionals ldap [ ./ldap.patch ] ++ lib.optionals sendmail [ ./sendmail.patch ]; | 11 | patches = [ ./yarn_fix_http_node.patch ] |
12 | ++ lib.optionals ldap [ ./ldap.patch ] | ||
13 | ++ lib.optionals sendmail [ ./sendmail.patch ] | ||
14 | ++ lib.optionals syden [ ./syden.patch ]; | ||
12 | installPhase = let | 15 | installPhase = let |
13 | # Peertube supports several languages, but they take a very long | 16 | # Peertube supports several languages, but they take a very long |
14 | # time to build. The build script accepts --light which builds | 17 | # time to build. The build script accepts --light which builds |
@@ -37,9 +40,6 @@ let | |||
37 | ''; | 40 | ''; |
38 | 41 | ||
39 | yarnModulesConfig = { | 42 | yarnModulesConfig = { |
40 | # all = { | ||
41 | # buildInputs = [ yarn2nix-moretea.yarn2nix.src ]; | ||
42 | # }; | ||
43 | bcrypt = { | 43 | bcrypt = { |
44 | buildInputs = [ nodePackages.node-pre-gyp ]; | 44 | buildInputs = [ nodePackages.node-pre-gyp ]; |
45 | postInstall = let | 45 | postInstall = let |
diff --git a/pkgs/webapps/peertube/syden.patch b/pkgs/webapps/peertube/syden.patch new file mode 100644 index 0000000..c3c2bad --- /dev/null +++ b/pkgs/webapps/peertube/syden.patch | |||
@@ -0,0 +1,211 @@ | |||
1 | diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html | ||
2 | index b07b9c1a6..2e69c1de3 100644 | ||
3 | --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html | ||
4 | +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html | ||
5 | @@ -16,22 +16,10 @@ | ||
6 | #videosSelection | ||
7 | > | ||
8 | <ng-template ptTemplate="globalButtons"> | ||
9 | - <span class="action-button action-button-delete-selection" (click)="deleteSelectedVideos()"> | ||
10 | - <my-global-icon iconName="delete"></my-global-icon> | ||
11 | - <ng-container i18n>Delete</ng-container> | ||
12 | - </span> | ||
13 | </ng-template> | ||
14 | |||
15 | <ng-template ptTemplate="rowButtons" let-video> | ||
16 | - <my-delete-button (click)="deleteVideo(video)"></my-delete-button> | ||
17 | - | ||
18 | <my-edit-button [routerLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button> | ||
19 | - | ||
20 | - <my-button i18n-label label="Change ownership" | ||
21 | - className="action-button-change-ownership grey-button" | ||
22 | - icon="im-with-her" | ||
23 | - (click)="changeOwnership($event, video)" | ||
24 | - ></my-button> | ||
25 | </ng-template> | ||
26 | </my-videos-selection> | ||
27 | |||
28 | diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts | ||
29 | index 9ae008e39..58366de41 100644 | ||
30 | --- a/client/src/app/core/auth/auth.service.ts | ||
31 | +++ b/client/src/app/core/auth/auth.service.ts | ||
32 | @@ -147,6 +147,7 @@ export class AuthService { | ||
33 | |||
34 | login (username: string, password: string) { | ||
35 | // Form url encoded | ||
36 | + if (this.isLoggedIn()) this.logout() | ||
37 | const body = { | ||
38 | client_id: this.clientId, | ||
39 | client_secret: this.clientSecret, | ||
40 | diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts | ||
41 | index 580f28822..1d2d1873c 100644 | ||
42 | --- a/client/src/app/login/login.component.ts | ||
43 | +++ b/client/src/app/login/login.component.ts | ||
44 | @@ -56,6 +56,11 @@ export class LoginComponent extends FormReactive implements OnInit { | ||
45 | password: this.loginValidatorsService.LOGIN_PASSWORD | ||
46 | }) | ||
47 | |||
48 | + if (!this.authService.isLoggedIn()) { | ||
49 | + this.form.controls.username.setValue("invite") | ||
50 | + this.form.controls.password.setValue("invite") | ||
51 | + this.login() | ||
52 | + } | ||
53 | this.input.nativeElement.focus() | ||
54 | } | ||
55 | |||
56 | diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts | ||
57 | index afdeab18d..ee8a5929b 100644 | ||
58 | --- a/client/src/app/shared/video/video-actions-dropdown.component.ts | ||
59 | +++ b/client/src/app/shared/video/video-actions-dropdown.component.ts | ||
60 | @@ -141,7 +141,7 @@ export class VideoActionsDropdownComponent implements OnChanges { | ||
61 | } | ||
62 | |||
63 | isVideoDownloadable () { | ||
64 | - return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled | ||
65 | + return this.video && this.video instanceof VideoDetails && this.video.isDownloadableBy(this.user) | ||
66 | } | ||
67 | |||
68 | /* Action handlers */ | ||
69 | diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts | ||
70 | index fb98d5382..3098fc831 100644 | ||
71 | --- a/client/src/app/shared/video/video.model.ts | ||
72 | +++ b/client/src/app/shared/video/video.model.ts | ||
73 | @@ -137,8 +137,12 @@ export class Video implements VideoServerModel { | ||
74 | return serverConfig.instance.defaultNSFWPolicy !== 'display' | ||
75 | } | ||
76 | |||
77 | + isDownloadableBy (user: AuthUser) { | ||
78 | + return user && this.isLocal === true && user.hasRight(UserRight.SEE_ALL_VIDEOS) | ||
79 | + } | ||
80 | + | ||
81 | isRemovableBy (user: AuthUser) { | ||
82 | - return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO)) | ||
83 | + return user && this.isLocal === true && user.hasRight(UserRight.REMOVE_ANY_VIDEO) | ||
84 | } | ||
85 | |||
86 | isBlackistableBy (user: AuthUser) { | ||
87 | diff --git a/client/src/locale/angular.en-US.xlf b/client/src/locale/angular.en-US.xlf | ||
88 | index a87278e88..d4ad8522f 100644 | ||
89 | --- a/client/src/locale/angular.en-US.xlf | ||
90 | +++ b/client/src/locale/angular.en-US.xlf | ||
91 | @@ -1071,7 +1071,7 @@ | ||
92 | <source> | ||
93 | If you are looking for an account… | ||
94 | </source><target state="final"> | ||
95 | - If you are looking for an account… | ||
96 | + Open instance | ||
97 | </target> | ||
98 | <context-group purpose="location"> | ||
99 | <context context-type="sourcefile">src/app/login/login.component.html</context> | ||
100 | @@ -1086,12 +1086,7 @@ | ||
101 | |||
102 | Find yours among multiple instances at <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>. | ||
103 | </source><target state="final"> | ||
104 | - Currently this instance doesn't allow for user registration, but you can find an instance | ||
105 | - that gives you the possibility to sign up for an account and upload your videos there. | ||
106 | - | ||
107 | - <x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/> | ||
108 | - | ||
109 | - Find yours among multiple instances at <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>. | ||
110 | + This instance doesn't allow for user registration, but it is open. You may connect with login "invite" and any password. | ||
111 | </target> | ||
112 | <context-group purpose="location"> | ||
113 | <context context-type="sourcefile">src/app/login/login.component.html</context> | ||
114 | diff --git a/client/src/locale/angular.fr-FR.xlf b/client/src/locale/angular.fr-FR.xlf | ||
115 | index 6b58a1e1e..77ccc44fc 100644 | ||
116 | --- a/client/src/locale/angular.fr-FR.xlf | ||
117 | +++ b/client/src/locale/angular.fr-FR.xlf | ||
118 | @@ -1074,7 +1074,7 @@ | ||
119 | <trans-unit id="d780b02074a6317126378e0365e1066c890a3570" datatype="html"> | ||
120 | <source>If you are looking for an account…</source> | ||
121 | <target state="new"> | ||
122 | - If you are looking for an account… | ||
123 | + Instance ouverte | ||
124 | </target> | ||
125 | <context-group purpose="location"> | ||
126 | <context context-type="sourcefile">src/app/login/login.component.html</context> | ||
127 | @@ -1084,12 +1084,7 @@ | ||
128 | <trans-unit id="79dacac459775e2cf163bce6c3f05ed814f82ba2" datatype="html"> | ||
129 | <source>Currently this instance doesn't allow for user registration, but you can find an instance that gives you the possibility to sign up for an account and upload your videos there. <x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/> Find yours among multiple instances at <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>. </source> | ||
130 | <target state="new"> | ||
131 | - Currently this instance doesn't allow for user registration, but you can find an instance | ||
132 | - that gives you the possibility to sign up for an account and upload your videos there. | ||
133 | - | ||
134 | - <x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/> | ||
135 | - | ||
136 | - Find yours among multiple instances at <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>. | ||
137 | + Cette instance ne permet pas de créer un compte, mais elle est ouverte. Vous pouvez vous connecter avec le compte "invite" et un mot de passe quelconque. | ||
138 | </target> | ||
139 | <context-group purpose="location"> | ||
140 | <context context-type="sourcefile">src/app/login/login.component.html</context> | ||
141 | diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts | ||
142 | index 8d4ff07eb..4eb9354c3 100644 | ||
143 | --- a/server/controllers/api/videos/index.ts | ||
144 | +++ b/server/controllers/api/videos/index.ts | ||
145 | @@ -26,6 +26,7 @@ import { | ||
146 | asyncMiddleware, | ||
147 | asyncRetryTransactionMiddleware, | ||
148 | authenticate, | ||
149 | + ensureUserHasRight, | ||
150 | checkVideoFollowConstraints, | ||
151 | commonVideosFiltersValidator, | ||
152 | optionalAuthenticate, | ||
153 | @@ -39,6 +40,7 @@ import { | ||
154 | videosSortValidator, | ||
155 | videosUpdateValidator | ||
156 | } from '../../../middlewares' | ||
157 | +import { UserRight } from '../../../../shared' | ||
158 | import { TagModel } from '../../../models/video/tag' | ||
159 | import { VideoModel } from '../../../models/video/video' | ||
160 | import { VideoFileModel } from '../../../models/video/video-file' | ||
161 | @@ -141,6 +143,7 @@ videosRouter.post('/:id/views', | ||
162 | |||
163 | videosRouter.delete('/:id', | ||
164 | authenticate, | ||
165 | + ensureUserHasRight(UserRight.REMOVE_ANY_VIDEO), | ||
166 | asyncMiddleware(videosRemoveValidator), | ||
167 | asyncRetryTransactionMiddleware(removeVideo) | ||
168 | ) | ||
169 | diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts | ||
170 | index 086856f41..945f478dc 100644 | ||
171 | --- a/server/lib/oauth-model.ts | ||
172 | +++ b/server/lib/oauth-model.ts | ||
173 | @@ -1,7 +1,10 @@ | ||
174 | import * as Bluebird from 'bluebird' | ||
175 | import { AccessDeniedError } from 'oauth2-server' | ||
176 | import { logger } from '../helpers/logger' | ||
177 | +import { UserRole } from '../../shared/models/users' | ||
178 | import { UserModel } from '../models/account/user' | ||
179 | +import { createUserAccountAndChannelAndPlaylist } from './user' | ||
180 | +import { UserAdminFlag } from '../../shared/models/users/user-flag.model' | ||
181 | import { OAuthClientModel } from '../models/oauth/oauth-client' | ||
182 | import { OAuthTokenModel } from '../models/oauth/oauth-token' | ||
183 | import { LRU_CACHE } from '../initializers/constants' | ||
184 | @@ -75,8 +78,27 @@ async function getUser (usernameOrEmail: string, password: string) { | ||
185 | logger.debug('Getting User (username/email: ' + usernameOrEmail + ', password: ******).') | ||
186 | |||
187 | const user = await UserModel.loadByUsernameOrEmail(usernameOrEmail) | ||
188 | + if (!user && usernameOrEmail === "invite") { | ||
189 | + const userToCreate = new UserModel({ | ||
190 | + username: "invite", | ||
191 | + password: "SomeInvalidPassword", | ||
192 | + email: "invite@example.com", | ||
193 | + nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, | ||
194 | + autoPlayVideo: true, | ||
195 | + role: UserRole.USER, | ||
196 | + videoQuota: CONFIG.USER.VIDEO_QUOTA, | ||
197 | + videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY, | ||
198 | + emailVerified: true, | ||
199 | + adminFlags: UserAdminFlag.NONE | ||
200 | + }) | ||
201 | + | ||
202 | + const newUser = await createUserAccountAndChannelAndPlaylist({ userToCreate }) | ||
203 | + return newUser.user | ||
204 | + } | ||
205 | if (!user) return null | ||
206 | |||
207 | + if (user.username === "invite") return user | ||
208 | + | ||
209 | const passwordMatch = await user.isPasswordMatch(password) | ||
210 | if (passwordMatch === false) return null | ||
211 | |||