mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-03-31 16:00:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

channel creation on version upload

Browse Source
This commit is contained in:
Jake Potrebic 2020-09-03 19:14:18 -07:00
parent 63435b7dd4
commit 5dc90a634b
No known key found for this signature in database
GPG Key ID: 7C58557EC9C421F8
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/io/papermc/hangar/controller/VersionsController.java
View File

@ -24,6 +24,8 @@ import org.springframework.web.servlet.view.RedirectView;
import java.nio.file.Path;
import java.time.OffsetDateTime;
import java.util.List;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -267,9 +269,31 @@ public class VersionsController extends HangarController {
return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
}
List<ProjectChannelsTable> projectChannels = channelService.getProjectChannels(projectData.getProject().getId());
String alertMsg = null;
String[] alertArgs = new String[0];
Optional<ProjectChannelsTable> channelOptional = projectChannels.stream().filter(ch -> ch.getName().equals(channelInput.trim())).findAny();
ProjectChannelsTable channel;
if (channelOptional.isEmpty()) {
if (projectChannels.size() >= hangarConfig.projects.getMaxChannels()) {
alertMsg = "error.channel.maxChannels";
alertArgs = new String[] {String.valueOf(hangarConfig.projects.getMaxChannels())};
}
else if (projectChannels.stream().anyMatch(ch -> ch.getColor() == channelColor)) {
alertMsg = "error.channel.duplicateColor";
}
if (alertMsg != null) {
AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, alertMsg, alertArgs);
return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
}
channel = channelService.addProjectChannel(projectData.getProject().getId(), channelInput.trim(), channelColor);
} else {
channel = channelOptional.get();
}
PendingVersion newPendingVersion = pendingVersion.copy(
channelInput.trim(),
channelColor,
channel.getName(),
channel.getColor(),
forumPost,
content
);
@ -279,10 +303,8 @@ public class VersionsController extends HangarController {
return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
}
ProjectChannelsTable channel = channelService.getProjectChannel(projectData.getProject().getId(), channelInput);
ProjectVersionsTable version;
try {
if (channel == null) throw new HangarException("error.channel.invalidName", channelInput);
version = newPendingVersion.complete(request, projectData, projectFactory);
} catch (HangarException e) {
AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, e.getMessage(), e.getArgs());

3
src/main/java/io/papermc/hangar/service/project/ProjectFactory.java
View File

@ -145,9 +145,6 @@ public class ProjectFactory {
public ProjectVersionsTable createVersion(HttpServletRequest request, ProjectData project, PendingVersion pendingVersion) {
ProjectChannelsTable channel = projectChannelDao.get().getProjectChannel(project.getProject().getId(), pendingVersion.getChannelName(), null);
if (channel == null) {
channel = channelService.addProjectChannel(project.getProject().getId(), pendingVersion.getChannelName(), pendingVersion.getChannelColor());
}
if (versionService.exists(pendingVersion) && hangarConfig.projects.isFileValidate()) {
throw new HangarException("error.version.duplicate");