kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-04-29 16:30:29 +05:30
Code Issues Projects Releases Wiki Activity

Add support for overriding subscriptions when importing.

Browse Source
This commit is contained in:
FireMasterK 2021-08-28 13:26:50 +05:30
parent 86827d6a2c
commit 3e99d1d806
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/kavin/piped/ServerLauncher.java
View File

@ -254,9 +254,8 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
try { try {
String[] subscriptions = Constants.mapper.readValue(request.loadBody().getResult().asArray(), String[] subscriptions = Constants.mapper.readValue(request.loadBody().getResult().asArray(),
String[].class); String[].class);
return getJsonResponse( return getJsonResponse(ResponseHelper.importResponse(request.getHeader(AUTHORIZATION),
ResponseHelper.importResponse(request.getHeader(AUTHORIZATION), subscriptions), subscriptions, Boolean.parseBoolean(request.getQueryParameter("override"))), "private");
"private");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e); return getErrorResponse(e);
} }

11
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View File

@ -801,7 +801,7 @@ public class ResponseHelper {
} }
public static final byte[] importResponse(String session, String[] channelIds) public static final byte[] importResponse(String session, String[] channelIds, boolean override)
throws IOException, NoSuchAlgorithmException, InvalidKeySpecException { throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
Session s = DatabaseSessionFactory.createSession(); Session s = DatabaseSessionFactory.createSession();
@ -811,9 +811,12 @@ public class ResponseHelper {
if (user != null) { if (user != null) {
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
for (String channelId : channelIds) if (override)
if (!user.getSubscribed().contains(channelId)) user.setSubscribed(Arrays.asList(channelIds));
user.getSubscribed().add(channelId); else
for (String channelId : channelIds)
if (!user.getSubscribed().contains(channelId))
user.getSubscribed().add(channelId);
if (channelIds.length > 0) { if (channelIds.length > 0) {
s.update(user); s.update(user);