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

Multi platform (#161)

Browse Source 
Co-authored-by: MiniDigger <admin@minidigger.me>
This commit is contained in:
Jake Potrebic 2020-10-03 04:33:58 -07:00 committed by GitHub
parent 306da7b619
commit 3156209750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 2763 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/.prettierrc
View File

@ -2,5 +2,5 @@
"tabWidth": 4,
"semi": true,
"singleQuote": true,
"printWidth": 120
"printWidth": 160
}

460
src/main/frontend/src/CreateVersion.vue Normal file
View File

@ -0,0 +1,460 @@
<template>
<template v-if="pendingVersion">
<div class="plugin-meta">
<table class="plugin-meta-table">
<tr>
<td><strong>Version</strong></td>
<td>
<div class="form-group">
<label for="version-string-input" class="sr-only">Version String</label>
<input
type="text"
id="version-string-input"
class="form-control"
required
v-model="payload.versionString"
:disabled="pendingVersion.versionString"
/>
</div>
</td>
</tr>
<template v-if="pendingVersion.fileName && !pendingVersion.externalUrl">
<tr>
<td><strong>File name</strong></td>
<td>{{ pendingVersion.fileName }}</td>
</tr>
<tr>
<td><strong>File size</strong></td>
<td>{{ filesize(pendingVersion.fileSize) }}</td>
</tr>
</template>
<template v-else>
<tr>
<td><strong>External URL</strong></td>
<td>
<div class="form-group">
<label for="external-url-input" class="sr-only"></label>
<input id="external-url-input" class="form-control" type="text" required v-model="payload.externalUrl" />
</div>
</td>
</tr>
</template>
<tr>
<td><strong>Channel</strong></td>
<td class="form-inline">
<select id="select-channel" class="form-control" v-model="payload.channel.name" style="margin-right: 10px">
<option v-for="channel in channels" :key="channel.id" :value="channel.name" :data-color="channel.color.hex">
{{ channel.name }}
</option>
</select>
<a href="#">
<i id="channel-new" class="fas fa-plus" data-toggle="modal" data-target="#channel-settings"></i>
</a>
</td>
</tr>
<DependencySelection
v-model:platforms-prop="payload.platforms"
v-model:dependencies-prop="payload.dependencies"
:prev-version="pendingVersion.prevVersion"
></DependencySelection>
<tr>
<td>
<label for="is-unstable-version" class="form-check-label">
<strong>Mark this version as unstable</strong>
</label>
</td>
<td class="rv">
<div class="form-check">
<input id="is-unstable-version" class="form-check-input" type="checkbox" v-model="payload.unstable" />
</div>
<div class="clearfix"></div>
</td>
</tr>
<tr>
<td>
<label for="is-recommended-version" class="form-check-label">
<strong>Recommended</strong>
</label>
</td>
<td class="rv">
<div class="form-check">
<input id="is-recommended-version" class="form-check-input" type="checkbox" v-model="payload.recommended" />
</div>
<div class="clearfix"></div>
</td>
</tr>
<tr>
<td>
<label for="create-forum-post-version" class="form-check-label"></label>
<strong>Create forum post</strong>
</td>
<td class="rv">
<div class="form-check">
<input id="create-forum-post-version" class="form-check-input" type="checkbox" v-model="payload.forumSync" />
</div>
<div class="clearfix"></div>
</td>
</tr>
</table>
</div>
<div class="release-bulletin">
<div style="position: relative">
<h3>Release Bulletin</h3>
<p>What's new in this release?</p>
<Editor enabled :raw="pendingVersion.description || ''" target-form="form-publish" v-model:content-prop="payload.content"></Editor>
</div>
</div>
</template>
<HangarForm
id="form-upload"
:action="ROUTES.parse('VERSIONS_UPLOAD', ownerName, projectSlug)"
method="post"
enctype="multipart/form-data"
clazz="form-inline"
>
<div class="input-group float-left" style="width: 50%">
<label for="pluginFile" style="flex-wrap: wrap">
<span style="flex: 0 0 100%; margin-bottom: 10px" v-if="!pendingVersion">Either upload a file...</span>
<div :class="'btn btn-primary' + (pendingVersion ? ' mt-1': '')" style="flex: 0 0 100%">
<template v-if="!pendingVersion">
Upload
</template>
<template v-else>
Change file
</template>
</div>
</label>
<input
type="file"
id="pluginFile"
name="pluginFile"
accept=".jar,.zip"
style="display: none;"
@change="fileUploaded($event.target.name, $event.target.files)"
/>
</div>
<div class="alert-file file-project float-right" style="display: none">
<div class="alert alert-info float-left">
<i class="far fa-file-archive"></i>
<strong class="file-name"></strong>
<span class="file-size float-right"></span>
</div>
<div class="file-upload float-right">
<button
data-toggle="tooltip"
data-placement="right"
title="Sign plugin"
type="submit"
name="submit"
form="form-upload"
class="btn btn-info btn-block btn-sign"
>
<i class="fas fa-pencil-alt"></i>
</button>
</div>
</div>
</HangarForm>
<template v-if="pendingVersion">
<button class="btn btn-primary float-right mt-1 mr-1" @click="publish">Publish</button>
</template>
<template v-else>
<HangarForm :action="ROUTES.parse('VERSIONS_CREATE_EXTERNAL_URL', ownerName, projectSlug)" method="post" id="form-url-upload" clazz="form-inline">
<div class="input-group float-right" style="width: 50%">
<label for="externalUrl" style="margin-bottom: 10px">...or specify an external URL</label>
<input type="text" class="form-control" id="externalUrl" name="externalUrl" placeholder="External URL" style="width: 70%" />
<div class="input-group-append">
<button class="btn btn-primary" type="submit">Create Version</button>
</div>
</div>
</HangarForm>
</template>
</template>
<script>
import HangarForm from '@/components/HangarForm';
// import PlatformChoice from '@/PlatformChoice';
import DependencySelection from '@/components/DependencySelection';
// import PlatformTags from '@/components/PlatformTags';
import Editor from '@/components/Editor';
import 'bootstrap/js/dist/tooltip';
import $ from 'jquery';
import 'bootstrap/js/dist/collapse';
import filesize from 'filesize';
import axios from 'axios';
export default {
name: 'CreateVersion',
components: {
HangarForm,
// PlatformChoice,
DependencySelection,
// PlatformTags,
Editor,
},
props: {
defaultColor: String,
pendingVersion: Object,
ownerName: String,
projectSlug: String,
channels: Array,
forumSync: Boolean,
},
data() {
return {
MAX_FILE_SIZE: 20971520,
ROUTES: window.ROUTES,
payload: {
versionString: null,
description: null,
externalUrl: null,
channel: {
name: null,
color: null,
},
platforms: {},
dependencies: {},
unstable: false,
recommended: false,
forumSync: null,
content: '',
},
};
},
created() {
if (this.pendingVersion) {
console.log(this.pendingVersion);
if (this.pendingVersion.versionString) {
this.payload.versionString = this.pendingVersion.versionString;
this.payload.description = this.pendingVersion.description;
for (const platform of this.pendingVersion.platforms) {
this.payload.platforms[platform.name] = platform.versions;
}
this.payload.dependencies = this.pendingVersion.dependencies;
} else {
this.payload.externalUrl = this.pendingVersion.externalUrl;
}
this.payload.channel.name = this.pendingVersion.channelName;
this.payload.channel.color = this.pendingVersion.channelColor;
this.payload.forumSync = this.forumSync;
}
},
methods: {
getAlert() {
return $('.alert-file');
},
clearIcon(e) {
return e.removeClass('fa-spinner').removeClass('fa-spin').addClass('fa-pencil-alt').addClass('fa-upload');
},
reset() {
const alert = this.getAlert();
alert.hide();
const control = alert.find('.file-upload');
control.find('button').removeClass('btn-danger').addClass('btn-success').prop('disabled', false);
this.clearIcon(control.find('[data-fa-i2svg]')).addClass('fa-pencil-alt');
const bs = alert.find('.alert');
bs.removeClass('alert-danger').addClass('alert-info');
bs.find('[data-fa-i2svg]').attr('data-prefix', 'far');
if (bs.find('[data-fa-i2svg]').data('ui-tooltip')) {
bs.find('[data-fa-i2svg]').removeClass('fa-exclamation-circle').addClass('fa-file-archive').tooltip('dispose');
}
return alert;
},
failure(message) {
const alert = this.getAlert();
const bs = alert.find('.alert');
bs.removeClass('alert-info').addClass('alert-danger');
const noticeIcon = bs.find('[data-fa-i2svg]');
noticeIcon.attr('data-prefix', 'fas');
noticeIcon.toggleClass('fa-file-archive').toggleClass('fa-exclamation-circle');
bs.tooltip({
placement: 'left',
title: message,
});
function flash(amount) {
if (amount > 0) {
bs.find('[data-fa-i2svg]').fadeOut('fast', function () {
bs.find('[data-fa-i2svg]').fadeIn('fast', flash(amount - 1));
});
}
}
flash(7);
},
failurePlugin(message) {
this.failure(message);
const alert = this.getAlert();
const control = alert.find('.file-upload');
control.find('button').removeClass('btn-success').addClass('btn-danger').prop('disabled', true);
this.clearIcon(control.find('[data-fa-i2svg]')).addClass('fa-times');
},
fileUploaded(name, files) {
const alert = this.reset();
if (files.length === 0) {
$('#form-upload')[0].reset();
return;
}
let fileName = files[0].name;
const fileSize = files[0].size;
if (!fileName) {
alert.fadeOut(1000);
return;
}
let success = true;
if (fileSize > this.MAX_FILE_SIZE) {
this.failurePlugin('That file is too big. Plugins may be no larger than ' + filesize(this.MAX_FILE_SIZE) + '.');
success = false;
} else if (!fileName.endsWith('.zip') && !fileName.endsWith('.jar')) {
this.failurePlugin('Only JAR and ZIP files are accepted.');
success = false;
}
fileName = fileName.substr(fileName.lastIndexOf('\\') + 1, fileName.length);
alert.find('.file-name').text(fileName);
alert.find('.file-size').text(filesize(files[0].size));
alert.fadeIn('slow');
$('#form-url-upload').css('display', 'none');
if (success) {
const alertInner = alert.find('.alert');
const button = alert.find('button');
const icon = button.find('[data-fa-i2svg]');
alertInner.removeClass('alert-info alert-danger').addClass('alert-success');
button.removeClass('btn-info').addClass('btn-success');
icon.addClass('fa-upload');
const newTitle = 'Upload plugin';
button.tooltip('hide').data('original-title', newTitle).tooltip();
}
},
filesize,
scrollTo(selector) {
$([document.documentElement, document.body]).animate(
{
scrollTop: $(selector).offset().top - 80,
},
600
);
},
publish() {
const requiredProps = [
{
propName: 'forumSync',
},
{
propName: 'recommended',
},
{
propName: 'unstable',
},
{
propName: 'versionString',
selector: '#version-string-input',
},
{
propName: 'channel.color',
},
{
propName: 'channel.name',
},
{
propName: 'content',
selector: '.version-content-view',
},
];
$('.invalid-input').removeClass('invalid-input');
// Validations
for (const prop of requiredProps) {
const val = prop.propName.split('.').reduce((o, i) => o[i], this.payload);
if (typeof val === 'undefined' || val === null || val === '') {
if (prop.selector) {
const el = $(prop.selector);
el.addClass('invalid-input');
this.scrollTo(prop.selector);
}
return;
}
}
const parentEl = $('#dependencies-accordion');
const depCollapseEl = $('#dep-collapse');
for (const platform in this.payload.dependencies) {
for (const dep of this.payload.dependencies[platform]) {
if (!dep.project_id && !dep.external_url) {
this.scrollTo('#dependencies-accordion');
depCollapseEl.collapse('show');
$(`#${platform}-${dep.name}-link-cell`).addClass('invalid-input');
console.error(`Missing link for ${dep.name} on ${platform}`);
return;
}
}
}
if (Object.keys(this.payload.platforms).length === 0) {
this.scrollTo('#dependencies-accordion');
depCollapseEl.collapse('show');
parentEl.addClass('invalid-input');
return;
}
for (const platform in this.payload.platforms) {
if (!this.payload.platforms[platform].length) {
depCollapseEl.collapse('show');
this.scrollTo('#dependencies-accordion');
$(`#${platform}-row`).addClass('invalid-input');
return;
}
}
const platformDeps = [];
for (const platform in this.payload.platforms) {
platformDeps.push({
name: platform,
versions: this.payload.platforms[platform],
});
}
if (this.payload.content == null) {
this.payload.content = '';
}
const url = window.ROUTES.parse('VERSIONS_SAVE_NEW_VERSION', this.ownerName, this.projectSlug, this.payload.versionString);
axios
.post(
url,
{
...this.payload,
platforms: platformDeps,
},
{
headers: {
[window.csrfInfo.headerName]: window.csrfInfo.token,
},
}
)
.then(() => {
$('form')
.attr('action', window.ROUTES.parse('VERSIONS_PUBLISH', this.ownerName, this.projectSlug, this.payload.versionString))
.attr('method', 'post')
.submit();
});
},
},
mounted() {
$('.btn-edit').click();
},
};
</script>

47
src/main/frontend/src/VersionList.vue
View File

@ -2,10 +2,7 @@
<div class="version-list">
<div class="row text-center">
<div class="col-12">
<a
v-if="canUpload"
class="btn yellow"
:href="routes.Versions.showCreator(htmlDecode(projectOwner), htmlDecode(projectSlug)).absoluteURL()"
<a v-if="canUpload" class="btn yellow" :href="ROUTES.parse('VERSIONS_SHOW_CREATOR', projectOwner, projectSlug)"
>Upload a New Version</a
>
</div>
@ -18,13 +15,7 @@
<div class="list-group">
<a
v-for="(version, index) in versions"
:href="
routes.Versions.show(
htmlDecode(projectOwner),
htmlDecode(projectSlug),
version.name
).absoluteURL()
"
:href="ROUTES.parse('VERSIONS_SHOW', htmlDecode(projectOwner), htmlDecode(projectSlug), version.name)"
class="list-group-item list-group-item-action"
:class="[classForVisibility(version.visibility)]"
:key="index"
@ -32,7 +23,7 @@
<div class="container-fluid">
<div class="row">
<div
class="col-6 col-sm-3"
class="col-4 col-md-2 col-lg-2"
:set="(channel = version.tags.find((filterTag) => filterTag.name === 'Channel'))"
>
<div class="row">
@ -40,23 +31,20 @@
<span class="text-bold">{{ version.name }}</span>
</div>
<div class="col-12">
<span
v-if="channel"
class="channel"
v-bind:style="{ background: channel.color.background }"
>{{ channel.data }}</span
>
<span v-if="channel" class="channel" v-bind:style="{ background: channel.color.background }">{{
channel.data
}}</span>
</div>
</div>
</div>
<div class="col-6 col-sm-3">
<div class="col-8 col-md-6 col-lg-4">
<Tag
v-for="tag in version.tags.filter((filterTag) => filterTag.name !== 'Channel')"
v-bind:key="tag.name + ':' + tag.data"
v-bind="tag"
></Tag>
</div>
<div class="col-3 hidden-xs">
<div class="col-md-4 col-lg-3 d-none d-md-block">
<div class="row">
<div class="col-12">
<i class="fas fa-fw fa-calendar"></i>
@ -71,7 +59,7 @@
</div>
</div>
</div>
<div class="col-3 hidden-xs">
<div class="col-md-3 col-lg-3 d-none d-lg-block">
<div class="row">
<div class="col-12">
<i class="fas fa-fw fa-user-tag"></i>
@ -87,13 +75,7 @@
</div>
</a>
</div>
<Pagination
:current="current"
:total="total"
@prev="page--"
@next="page++"
@jumpTo="page = $event"
></Pagination>
<Pagination :current="current" :total="total" @prev="page--" @next="page++" @jumpTo="page = $event"></Pagination>
</div>
</div>
</template>
@ -122,15 +104,14 @@ export default {
totalVersions: 0,
canUpload: false,
loading: true,
ROUTES: window.ROUTES,
};
},
created() {
this.update();
apiV2Request('permissions', 'GET', { author: window.PROJECT_OWNER, slug: window.PROJECT_SLUG }).then(
(response) => {
this.canUpload = response.permissions.includes('create_version');
}
);
apiV2Request('permissions', 'GET', { author: window.PROJECT_OWNER, slug: window.PROJECT_SLUG }).then((response) => {
this.canUpload = response.permissions.includes('create_version');
});
this.$watch(
() => this.page,
() => {

475
src/main/frontend/src/components/DependencySelection.vue Normal file
View File

@ -0,0 +1,475 @@
<template>
<tr>
<td colspan="2">
<div id="dependencies-accordion">
<div class="card bg-light">
<div class="card-header" id="dep-heading">
<button
class="btn btn-lg btn-block btn-primary"
data-toggle="collapse"
data-target="#dep-collapse"
aria-expanded="true"
aria-controls="dep-collapse"
>
Manage Platforms/Dependencies
</button>
</div>
<div id="dep-collapse" class="collapse" aria-labelledby="dep-heading" data-parent="#dependencies-accordion">
<div v-if="!loading" class="card-body">
<template v-for="(platform, platformKey) in platformInfo" :key="platformKey">
<div
:id="`${platformKey}-row`"
class="row platform-row align-items-center"
:style="{
backgroundColor: !platforms[platformKey] ? '#00000022' : platform.tag.background + '45',
}"
>
<div class="platform-row-overlay" :style="{ zIndex: !platforms[platformKey] ? 5 : -10 }"></div>
<div class="col-1 d-flex align-items-center" style="z-index: 10">
<input
:id="`${platformKey}-is-enabled`"
type="checkbox"
:checked="platforms[platformKey]"
:disabled="freezePlatforms"
class="mr-2"
@change="selectPlatform(platformKey)"
/>
<label :for="`${platformKey}-is-enabled`">
<span
class="platform-header p-1 rounded"
:style="{
color: platform.tag.foreground,
backgroundColor: platform.tag.background,
borderColor: platform.tag.background,
}"
>
{{ platform.name }}
</span>
</label>
</div>
<div class="col-3">
<div class="clearfix"></div>
<div>
<div class="row no-gutters">
<!--is there a better way of making two columns?-->
<div
v-for="(versionList, index) in [
platform.possibleVersions.slice(0, Math.ceil(platform.possibleVersions.length / 2)),
platform.possibleVersions.slice(Math.ceil(platform.possibleVersions.length / 2)),
]"
:key="index"
class="col-6 text-right d-flex flex-column justify-content-start"
>
<div v-for="version in versionList" :key="version">
<label :for="`${platformKey}-version-${version}`">
{{ version }}
</label>
<input
:id="`${platformKey}-version-${version}`"
type="checkbox"
:value="version"
v-model="platforms[platformKey]"
class="mr-2"
:disabled="!platforms[platformKey]"
/>
</div>
</div>
</div>
</div>
</div>
<div class="col-8 text-center">
<form :ref="`${platformKey.toLowerCase()}DepForm`" autocomplete="off">
<table
v-if="(dependencies[platformKey] && dependencies[platformKey].length) || !freezePlatforms"
class="table table-bordered table-dark dependency-table"
>
<tr>
<th>Name</th>
<th>Required</th>
<th>Link</th>
</tr>
<tr v-for="dep in dependencies[platformKey]" :key="dep.name">
<td class="text-center">
<div class="w-100">
{{ dep.name }}
</div>
<button
v-if="!freezePlatforms"
class="btn btn-danger"
@click="removeDepFromTable(platformKey, dep.name)"
>
<i class="fas fa-trash"></i>
</button>
</td>
<td class="align-middle">
<span :style="{ fontSize: '3rem', color: dep.required ? 'green' : 'red' }">
<i class="fas" :class="`${dep.required ? 'fa-check-circle' : 'fa-times-circle'}`"></i>
</span>
</td>
<td :id="`${platformKey}-${dep.name}-link-cell`">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<input
type="radio"
value="Hangar"
aria-label="Select Hangar Project"
v-model="dependencyLinking[platformKey][dep.name]"
@change="linkingClick('external_url', platformKey, dep.name)"
/>
</div>
</div>
<input
:id="`${platformKey}-${dep.name}-project-input`"
type="text"
class="form-control"
aria-label="Hangar Project Name"
placeholder="Search for project..."
:required="dependencyLinking[platformKey][dep.name] !== 'External'"
:disabled="dependencyLinking[platformKey][dep.name] !== 'Hangar'"
@focus="toggleFocus(platformKey, dep.name, true)"
@blur="toggleFocus(platformKey, dep.name, false)"
@input="projectSearch($event.target, platformKey, dep.name)"
/>
<ul
:id="`${platformKey}-${dep.name}-project-dropdown`"
class="search-dropdown list-group"
style="display: none"
>
<li
v-for="project in searchResults"
:key="`${project.namespace.owner}/${project.namespace.slug}`"
class="list-group-item list-group-item-dark"
@mousedown.prevent=""
@click="selectProject(platformKey, dep.name, project)"
>
{{ project.namespace.owner }} /
{{ project.namespace.slug }}
</li>
</ul>
</div>
<div class="input-group mt-1">
<div class="input-group-prepend">
<div class="input-group-text">
<input
type="radio"
value="External"
aria-label="External Link"
v-model="dependencyLinking[platformKey][dep.name]"
@change="linkingClick('project_id', platformKey, dep.name)"
/>
</div>
</div>
<input
:id="`${platformKey}-${dep.name}-external-input`"
type="text"
class="form-control"
aria-label="Hangar Project Name"
placeholder="Paste an external link"
:required="dependencyLinking[platformKey][dep.name] !== 'Hangar'"
:disabled="dependencyLinking[platformKey][dep.name] !== 'External'"
@change="setExternalUrl($event.target.value, platformKey, dep.name)"
/>
</div>
</td>
</tr>
<tr v-if="!freezePlatforms">
<td colspan="3">
<div class="input-group">
<input
:id="`${platformKey}-new-dep`"
type="text"
placeholder="Dependency Name"
class="form-control"
aria-label="New Dependency Name"
v-model="addDependency[platformKey].name"
/>
<div class="input-group-append">
<div class="input-group-text">
<input
:id="`${platformKey}-new-dep-required`"
class="mr-2"
type="checkbox"
aria-label="Dependency is required?"
v-model="addDependency[platformKey].required"
/>
<label :for="`${platformKey}-new-dep-required`" style="position: relative; top: 1px">
Required?
</label>
</div>
<button
:disabled="
!addDependency[platformKey].name || addDependency[platformKey].name.trim().length === 0
"
class="btn btn-info"
type="button"
@click="addDepToTable(platformKey)"
>
Add
</button>
</div>
</div>
</td>
</tr>
</table>
<i v-else class="dark-gray">No dependencies</i>
</form>
</div>
</div>
</template>
</div>
</div>
</div>
</div>
</td>
</tr>
</template>
<script>
import { nextTick } from 'vue';
import axios from 'axios';
import $ from 'jquery';
import 'bootstrap/js/dist/collapse';
import { isEmpty, remove, union } from 'lodash-es';
import { API } from '@/api';
export default {
name: 'DependencySelection',
emits: ['update:platformsProp', 'update:dependenciesProp'],
props: {
platformsProp: Object,
dependenciesProp: Object,
prevVersion: Object,
},
data() {
return {
freezePlatforms: false,
loading: true,
dependencyLinking: {},
searchResults: [],
platformInfo: {},
addDependency: {},
};
},
computed: {
platforms: {
get() {
return this.platformsProp;
},
set(val) {
this.$emit('update:platformsProp', val);
},
},
dependencies: {
get() {
return this.dependenciesProp;
},
set() {
this.$emit('update:dependenciesProp');
},
},
},
async created() {
const { data } = await axios.get(window.ROUTES.parse('APIV1_LIST_PLATFORMS'));
for (const platformObj of data) {
this.platformInfo[platformObj.name.toUpperCase()] = platformObj;
this.dependencyLinking[platformObj.name.toUpperCase()] = {};
this.addDependency[platformObj.name.toUpperCase()] = {
name: '',
required: false,
};
}
this.loading = false;
await nextTick();
if (!isEmpty(this.platforms)) {
this.freezePlatforms = true;
for (const platformName in this.platforms) {
if (this.prevVersion && this.prevVersion.platforms.find((plat) => plat.name === platformName)) {
this.platforms[platformName] = union(
this.platforms[platformName],
this.prevVersion.platforms.find((plat) => plat.name === platformName).versions
);
}
if (this.prevVersion && this.prevVersion.dependencies[platformName] && this.prevVersion.dependencies[platformName].length) {
this.setDependencyLinks(this.prevVersion.dependencies[platformName], platformName);
}
}
} else {
$('#dep-collapse').collapse('show');
if (this.prevVersion) {
for (const platformObj of this.prevVersion.platforms) {
const platformName = platformObj.name.toUpperCase();
this.platforms[platformName] = platformObj.versions;
}
console.log(this.prevVersion.dependencies);
for (const platform in this.prevVersion.dependencies) {
this.dependencies[platform.toUpperCase()] = this.prevVersion.dependencies[platform];
}
await nextTick();
for (const platform in this.dependencies) {
this.setDependencyLinks(this.dependencies[platform], platform);
}
}
}
},
methods: {
setDependencyLinks(deps, platformName) {
console.log(deps);
for (const dep of deps) {
if (dep.project_id) {
this.dependencyLinking[platformName][dep.name] = 'Hangar';
axios.get(window.ROUTES.parse('APIV1_SHOW_PROJECT_BY_ID', dep.project_id)).then((res) => {
if (res.data) {
this.selectProject(platformName, dep.name, res.data);
}
});
} else if (dep.external_url) {
$(`#${platformName}-${dep.name}-external-input`).val(dep.external_url);
this.dependencyLinking[platformName][dep.name] = 'External';
this.setExternalUrl(dep.external_url, platformName, dep.name);
}
}
},
isEmpty,
linkingClick(toReset, platformKey, depName) {
this.dependencies[platformKey].find((dep) => dep.name === depName)[toReset] = null;
},
toggleFocus(platformKey, depName, showDropdown) {
if (showDropdown) {
$(`#${platformKey}-${depName}-project-dropdown`).show();
} else {
$(`#${platformKey}-${depName}-project-dropdown`).hide();
}
},
projectSearch(target, platformKey, depName) {
if (target.value) {
const inputVal = target.value.trim();
const input = $(target);
if (input.data('namespace') !== inputVal) {
// reset on changing
input.data('namespace', '');
input.data('id', '');
this.dependencies[platformKey].find((dep) => dep.name === depName).project_id = null;
}
API.request(`projects?relevance=true&limit=25&offset=0&q=${inputVal}`).then((res) => {
if (res.result.length) {
$(`#${platformKey}-${depName}-project-dropdown`).show();
this.searchResults = res.result;
} else {
$(`#${platformKey}-${depName}-project-dropdown`).hide();
this.searchResults = [];
}
});
} else {
$(target).parent().find('.search-dropdown').hide();
}
},
selectProject(platformKey, depName, project) {
$(`#${platformKey}-${depName}-project-dropdown`).hide();
const input = $(`#${platformKey}-${depName}-project-input`);
let namespace = '';
if (project.namespace) {
namespace = `${project.namespace.owner} / ${project.namespace.slug}`;
} else {
namespace = `${project.author} / ${project.slug}`;
}
input.data('id', project.id);
input.data('namespace', namespace);
this.dependencies[platformKey].find((dep) => dep.name === depName).project_id = project.id;
input.val(namespace);
},
setExternalUrl(value, platformKey, depName) {
this.dependencies[platformKey].find((dep) => dep.name === depName).external_url = value;
},
selectPlatform(platformKey) {
if (!this.platforms[platformKey]) {
this.platforms[platformKey] = [];
this.dependencies[platformKey] = [];
} else {
delete this.platforms[platformKey];
delete this.dependencies[platformKey];
}
},
addDepToTable(platformKey) {
if (!this.dependencies[platformKey]) {
this.dependencies[platformKey] = [];
}
this.dependencies[platformKey].push({
name: this.addDependency[platformKey].name,
required: this.addDependency[platformKey].required,
project_id: null,
external_url: null,
});
this.addDependency[platformKey].name = '';
this.addDependency[platformKey].required = false;
},
removeDepFromTable(platformKey, depName) {
remove(this.dependencies[platformKey], (dep) => dep.name === depName);
},
},
};
</script>
<style lang="scss" scoped>
.search-dropdown {
position: absolute;
top: 100%;
max-height: 300px;
z-index: 100;
width: 100%;
li {
cursor: pointer;
}
}
label {
margin-bottom: 0;
}
.platform-row:not(:first-of-type) {
margin-top: 10px;
}
.platform-row {
position: relative;
padding-top: 10px;
padding-bottom: 10px;
}
.platform-row-overlay {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.6);
}
.platform-select-div {
position: absolute;
left: 0;
}
.platform-header {
border: #aaa 1px solid;
box-shadow: #2a2a2a;
font-size: 1.1em;
}
.dependency-table {
margin-bottom: 0;
}
.input-group > input[type='text'].form-control {
width: 1%;
}
.input-group input[type='text'] {
width: unset;
}
</style>

279
src/main/frontend/src/components/Editor.vue Normal file
View File

@ -0,0 +1,279 @@
<template>
<template v-if="enabled">
<!-- Edit -->
<button
type="button"
class="btn btn-sm btn-edit btn-page btn-default"
title="Edit"
@click.stop="pageBtnClick($event.currentTarget)"
>
<i class="fas fa-edit"></i> Edit
</button>
<!-- Preview -->
<div class="btn-edit-container btn-preview-container" title="Preview">
<button type="button" class="btn btn-sm btn-preview btn-page btn-default" @click.stop="pageBtnClick($event.currentTarget)">
<i class="fas fa-eye"></i>
</button>
</div>
<div v-if="saveable" class="btn-edit-container btn-save-container" title="Save">
<button
form="form-editor-save"
type="submit"
class="btn btn-sm btn-save btn-page btn-default"
@click.stop="pageBtnClick($event.currentTarget)"
>
<i class="fas fa-save"></i>
</button>
</div>
<div v-if="cancellable" class="btn-edit-container btn-cancel-container" title="Cancel">
<button
type="button"
class="btn btn-sm btn-cancel btn-page btn-default"
@click.stop="
btnCancel();
pageBtnClick($event.currentTarget);
"
>
<i class="fas fa-times"></i>
</button>
</div>
<template v-if="deletable">
<div class="btn-edit-container btn-delete container" title="Delete">
<button
type="button"
class="btn btn-sm btn-page-delete btn-page btn-default"
data-toggle="modal"
data-target="#modal-page-delete"
@click.stop="pageBtnClick($event.currentTarget)"
>
<i class="fas fa-trash"></i>
</button>
</div>
<div class="modal fade" id="modal-page-delete" tabindex="-1" role="dialog" aria-labelledby="label-page-delete">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="label-page-delete">Delete {{ subject.toLowerCase() }}</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Are you sure you want to delete this {{ subject.toLowerCase() }}? This cannot be undone.
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<HangarForm method="post" :action="deleteCall" clazz="form-inline">
<button type="submit" class="btn btn-danger">Delete</button>
</HangarForm>
</div>
</div>
</div>
</div>
</template>
<!-- Edit window -->
<div class="page-edit version-content-view" style="display: none">
<textarea name="content" class="form-control" :form="targetForm || 'form-editor-save'" v-model="content"></textarea>
</div>
<!-- Preview window -->
<div class="page-preview page-rendered version-content-view" style="display: none"></div>
<HangarForm v-if="saveable" method="post" :action="saveCall" id="form-editor-save">
<input v-if="extraFormValue" type="hidden" :value="extraFormValue" name="name" />
</HangarForm>
<div class="page-content page-rendered">{{ cooked }}</div>
</template>
</template>
<script>
import HangarForm from '@/components/HangarForm';
import $ from 'jquery';
import axios from 'axios';
import { toggleSpinner } from '@/utils';
export default {
name: 'Editor',
components: {
HangarForm,
},
emits: ['update:contentProp'],
props: {
saveCall: String,
deleteCall: String,
saveable: Boolean,
deletable: Boolean,
enabled: Boolean,
raw: String,
subject: String,
cancellable: Boolean,
targetForm: String,
extraFormValue: String,
contentProp: String,
},
computed: {
content: {
get() {
return this.contentProp;
},
set(val) {
this.$emit('update:contentProp', val);
},
},
},
data() {
return {
editing: false,
previewing: false,
cooked: null,
};
},
methods: {
showEditBtn(e) {
return new Promise((resolve) => {
this.animateEditBtn(e, '-34px', function () {
e.css('z-index', '1000');
resolve();
});
});
},
animateEditBtn(e, marginLeft) {
return new Promise((resolve) => {
e.animate({ marginLeft: marginLeft }, 100, function () {
resolve();
});
});
},
hideEditBtn(e, andThen) {
this.animateEditBtn(e, '0', andThen);
},
async getPreview(raw, target) {
toggleSpinner($(target).find('[data-fa-i2svg]').toggleClass('fa-eye'));
const res = await axios.post(
'/pages/preview',
{ raw },
{
headers: {
[window.csrfInfo.headerName]: window.csrfInfo.token,
},
}
);
toggleSpinner($(target).find('[data-fa-i2svg]').toggleClass('fa-eye'));
return res.data;
},
btnCancel() {
this.editing = false;
this.previewing = false;
// hide editor; show content
$('.page-edit').hide();
$('.page-preview').hide();
$('.page-content').show();
// move buttons behind
$('.btn-edit-container').css('z-index', '-1000');
// hide buttons
const fromSave = function () {
this.hideEditBtn($('.btn-save-container'), function () {
this.hideEditBtn($('.btn-preview-container'));
});
};
var btnDelete = $('.btn-delete-container');
var btnCancel = $('.btn-cancel-container');
if (btnDelete.length) {
this.hideEditBtn(btnDelete, function () {
this.hideEditBtn(btnCancel, fromSave);
});
} else {
this.hideEditBtn(btnCancel, fromSave);
}
},
async pageBtnClick(target) {
if ($(target).hasClass('open')) return;
$('button.open').removeClass('open').css('border', '1px solid #ccc');
$(target).addClass('open').css('border-right-color', 'white');
const otherBtns = $('.btn-edit-container');
const editor = $('.page-edit');
if ($(target).hasClass('btn-edit')) {
this.editing = true;
this.previewing = false;
$(this).css('position', 'absolute').css('top', '');
$(otherBtns).css('position', 'absolute').css('top', '');
// open editor
var content = $('.page-rendered');
editor.find('textarea').css('height', content.css('height'));
content.hide();
editor.show();
// show buttons
this.showEditBtn($('.btn-preview-container'))
.then(() => {
return this.showEditBtn($('.btn-save-container'));
})
.then(() => {
return this.showEditBtn($('.btn-cancel-container'));
})
.then(() => {
return this.showEditBtn($('.btn-delete-container'));
});
} else if ($(target).hasClass('btn-preview')) {
// render markdown
const preview = $('.page-preview');
const raw = editor.find('textarea').val();
editor.hide();
preview.show();
preview.html(await this.getPreview(raw));
this.editing = false;
this.previewing = true;
} else if ($(target).hasClass('btn-save')) {
// add spinner
toggleSpinner($(target).find('[data-fa-i2svg]').toggleClass('fa-save'));
}
},
},
async created() {
this.content = this.raw;
this.cooked = await this.getPreview(this.raw);
},
mounted() {
const btnEdit = $('.btn-edit');
if (!btnEdit.length) return;
const otherBtns = $('.btn-edit-container');
const editText = $('.page-edit').find('textarea');
editText
.focus(() => {
btnEdit
.css('border-color', '#66afe9')
.css('border-right', '1px solid white')
.css('box-shadow', 'inset 0 1px 1px rgba(0,0,0,.075), -3px 0 8px rgba(102, 175, 233, 0.6)');
otherBtns.find('.btn').css('border-right-color', '#66afe9');
})
.blur(() => {
$('.btn-page').css('border', '1px solid #ccc').css('box-shadow', 'none');
$('button.open').css('border-right', 'white');
});
},
};
</script>
<style lang="scss" scoped>
.btn-edit,
.btn-edit-container {
position: absolute;
//margin-left: -34px;
z-index: 1000;
}
</style>

24
src/main/frontend/src/components/HangarForm.vue Normal file
View File

@ -0,0 +1,24 @@
<template>
<form :action="action" :method="method" :enctype="enctype" :id="id" :class="clazz">
<input type="hidden" :name="name" :value="value" />
<slot></slot>
</form>
</template>
<script>
export default {
name: 'HangarForm',
props: {
action: String,
method: String,
enctype: String,
id: String,
clazz: String,
},
data() {
return {
name: window.csrfInfo.parameterName,
value: window.csrfInfo.token,
};
},
};
</script>

64
src/main/frontend/src/components/PlatformTags.vue Normal file
View File

@ -0,0 +1,64 @@
<template>
<div class="float-right" id="upload-platform-tags">
<template v-for="[platform, tag] in tagsArray" :key="platform">
<div class="tags">
<span
:style="{
color: tag.color.foreground,
backgroundColor: tag.color.background,
borderColor: tag.color.background,
}"
class="tag"
>
{{ tag.name }}
</span>
</div>
<div v-if="!empty(platforms)">
<template v-for="version in platforms[platform].possibleVersions" :key="version">
<label :for="`version-${version}`">{{ version }}</label>
<input
form="form-publish"
:id="`version-${version}`"
type="checkbox"
name="versions"
:value="version"
:checked="tag.data && tag.data.indexOf(version) > -1"
/>
<!-- <template v-if="(index + 1) % 5 === 0" v-html="</div><div>"> </template>-->
</template>
</div>
</template>
</div>
</template>
<script>
import { isEmpty } from 'lodash-es';
import axios from 'axios';
export default {
name: 'PlatformTags',
props: {
tags: Array,
},
data() {
return {
tagsArray: [],
platforms: {},
};
},
created() {
for (const obj of this.tags) {
this.tagsArray.push([Object.keys(obj)[0], obj[Object.keys(obj)[0]]]);
}
axios.get('/api/v1/platforms').then((res) => {
for (const platform of res.data) {
this.platforms[platform.name.toUpperCase()] = platform;
}
});
},
methods: {
empty(obj) {
return isEmpty(obj);
},
},
};
</script>

11
src/main/frontend/src/entrypoints/create-version.js Normal file
View File

@ -0,0 +1,11 @@
import { createApp } from 'vue';
import CreateVersion from '@/CreateVersion';
createApp(CreateVersion, {
defaultColor: window.DEFAULT_COLOR,
pendingVersion: window.PENDING_VERSION,
ownerName: window.OWNER_NAME,
projectSlug: window.PROJECT_SLUG,
channels: window.CHANNELS,
forumSync: window.FORUM_SYNC,
}).mount('#create-version');

12
src/main/frontend/src/scss/_creator.scss
View File

@ -46,13 +46,13 @@
input[type="text"] { width: 100%; }
tr { width: 100%; }
td { padding: 10px; }
tr:nth-child(2n) { background-color: #f5f5f5; }
& > tr:nth-child(2n) { background-color: #f5f5f5; }
.rv { padding: 0; }
margin-top: 5px;
width: 100%;
tr > td:nth-child(2n) {
& > tr > td:nth-child(2n) {
text-align: right;
float: right;
}
@ -119,3 +119,11 @@
> h3, > p { color: gray; }
}
}
.create-blurb {
margin-bottom: 10px;
}
.platform-row input[type=checkbox] {
margin-left: 5px;
}

5
src/main/frontend/src/scss/_utils.scss
View File

@ -48,6 +48,11 @@ a > .fa {
cursor: pointer;
}
.invalid-input,
.invalid-input:focus {
box-shadow: 0 0 2px 2px red !important;
}
@mixin no-box-shadow() {
box-shadow: none;
}

1
src/main/java/freemarker_implicit.ftl
View File

@ -1,5 +1,6 @@
[#ftl]
[#-- @implicitly included --]
[#-- @ftlvariable name="mapper" type="com.fasterxml.jackson.databind.ObjectMapper" --]
[#-- @ftlvariable name="_csrf" type="org.springframework.security.web.csrf.CsrfToken" --]
[#-- @ftlvariable name="cu" type="io.papermc.hangar.db.model.UsersTable" --]
[#-- @ftlvariable name="markdownService" type="io.papermc.hangar.service.MarkdownService" --]

1
src/main/java/io/papermc/hangar/config/CacheConfig.java
View File

@ -10,5 +10,6 @@ public class CacheConfig {
public static final String AUTHORS_CACHE = "AUTHORS_CACHE";
public static final String STAFF_CACHE = "STAFF_CACHE";
public static final String PENDING_VERSION_CACHE = "PENDING_VERSION_CACHE";
public static final String NEW_VERSION_CACHE = "NEW_VERSION_CACHE";
}

25
src/main/java/io/papermc/hangar/controller/Apiv1Controller.java
View File

@ -20,7 +20,6 @@ import io.papermc.hangar.model.Role;
import io.papermc.hangar.model.SsoSyncData;
import io.papermc.hangar.model.TagColor;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.ProjectSortingStrategy;
import io.papermc.hangar.model.viewhelpers.ProjectPage;
import io.papermc.hangar.model.viewhelpers.UserData;
@ -32,6 +31,7 @@ import io.papermc.hangar.service.UserActionLogService;
import io.papermc.hangar.service.UserService;
import io.papermc.hangar.service.api.V1ApiService;
import io.papermc.hangar.service.project.PagesSerivce;
import io.papermc.hangar.service.project.ProjectService;
import io.papermc.hangar.util.ApiUtil;
import io.papermc.hangar.util.TemplateHelper;
import org.slf4j.Logger;
@ -78,6 +78,7 @@ public class Apiv1Controller extends HangarController {
private final ObjectMapper mapper;
private final TemplateHelper templateHelper;
private final PagesSerivce pagesSerivce;
private final ProjectService projectService;
private final UserService userService;
private final SsoService ssoService;
private final V1ApiService v1ApiService;
@ -88,11 +89,12 @@ public class Apiv1Controller extends HangarController {
private final Supplier<ProjectsTable> projectsTable;
@Autowired
public Apiv1Controller(HangarConfig hangarConfig, ObjectMapper mapper, TemplateHelper templateHelper, PagesSerivce pagesSerivce, UserService userService, SsoService ssoService, V1ApiService v1ApiService, ApiKeyService apiKeyService, UserActionLogService userActionLogService, HttpServletRequest request, Supplier<ProjectsTable> projectsTable) {
public Apiv1Controller(HangarConfig hangarConfig, ObjectMapper mapper, TemplateHelper templateHelper, PagesSerivce pagesSerivce, ProjectService projectService, UserService userService, SsoService ssoService, V1ApiService v1ApiService, ApiKeyService apiKeyService, UserActionLogService userActionLogService, HttpServletRequest request, Supplier<ProjectsTable> projectsTable) {
this.hangarConfig = hangarConfig;
this.mapper = mapper;
this.templateHelper = templateHelper;
this.pagesSerivce = pagesSerivce;
this.projectService = projectService;
this.userService = userService;
this.ssoService = ssoService;
this.v1ApiService = v1ApiService;
@ -124,6 +126,12 @@ public class Apiv1Controller extends HangarController {
return ResponseEntity.ok((ObjectNode) writeProjects(List.of(project)).get(0));
}
@GetMapping("v1/projects/{id}")
public ResponseEntity<ObjectNode> showProject(@PathVariable long id) {
ProjectsTable project = projectService.getProjectsTable(id);
return ResponseEntity.ok((ObjectNode) writeProjects(List.of(project)).get(0));
}
@PreAuthorize("@authenticationService.authV1ApiRequest(T(io.papermc.hangar.model.Permission).EditApiKeys, T(io.papermc.hangar.controller.util.ApiScope).forProject(#author, #slug))")
@UserLock
@Secured("ROLE_USER")
@ -284,7 +292,8 @@ public class Apiv1Controller extends HangarController {
projectsTables.forEach(project -> {
ObjectNode projectObj = mapper.createObjectNode();
projectObj.put("author", project.getOwnerName())
projectObj.put("id", project.getId())
.put("author", project.getOwnerName())
.put("slug", project.getSlug())
.put("createdAt", project.getCreatedAt().toString())
.put("name", project.getName())
@ -326,15 +335,7 @@ public class Apiv1Controller extends HangarController {
.put("downloads", 0)
.put("description", version.getDescription());
objectNode.set("channel", mapper.valueToTree(channel));
objectNode.set("dependencies", Dependency.from(version.getDependencies()).stream().collect(Collector.of(mapper::createArrayNode, (array, dep) -> {
ObjectNode depObj = mapper.createObjectNode()
// TODO dependency identification
.put("author", dep.getPluginId())
.put("version", dep.getVersion());
array.add(depObj);
}, (ignored1, ignored2) -> {
throw new UnsupportedOperationException();
})));
objectNode.set("dependencies", mapper.valueToTree(version.getDependencies()));
objectNode.set("tags", tags.stream().collect(Collector.of(mapper::createArrayNode, (array, tag) -> array.add(mapper.valueToTree(tag)), (t1, t2) -> {
throw new UnsupportedOperationException();
})));

5
src/main/java/io/papermc/hangar/controller/HangarController.java
View File

@ -1,5 +1,6 @@
package io.papermc.hangar.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import freemarker.ext.beans.BeansWrapperBuilder;
import freemarker.template.Configuration;
import freemarker.template.TemplateHashModel;
@ -29,6 +30,8 @@ public abstract class HangarController {
private MarkdownService markdownService;
@Autowired
private TemplateHelper templateHelper;
@Autowired
private ObjectMapper mapper;
@Autowired
@ -45,6 +48,8 @@ public abstract class HangarController {
mav.addObject("markdownService", markdownService);
mav.addObject("rand", ThreadLocalRandom.current());
mav.addObject("utils", templateHelper);
mav.addObject("mapper", mapper);
try {
mav.addObject("Routes", staticModels.get("io.papermc.hangar.util.Routes"));

11
src/main/java/io/papermc/hangar/controller/ProjectsController.java
View File

@ -65,7 +65,6 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@ -379,7 +378,7 @@ public class ProjectsController extends HangarController {
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@Secured("ROLE_USER")
@PostMapping(value = "/{author}/{slug}/manage/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
public RedirectView softDelete(@PathVariable String author, @PathVariable String slug, @RequestParam(required = false) String comment, RedirectAttributes ra) {
public ModelAndView softDelete(@PathVariable String author, @PathVariable String slug, @RequestParam(required = false) String comment, RedirectAttributes ra) {
ProjectsTable project = projectsTable.get();
Visibility oldVisibility = project.getVisibility();
@ -387,19 +386,19 @@ public class ProjectsController extends HangarController {
projectFactory.softDeleteProject(project, comment);
AlertUtil.showAlert(ra, AlertUtil.AlertType.SUCCESS, "project.deleted", project.getName());
projectService.refreshHomePage();
return new RedirectView(Routes.getRouteUrlOf("showHome"));
return Routes.SHOW_HOME.getRedirect();
}
@GlobalPermission(NamedPermission.HARD_DELETE_PROJECT)
@Secured("ROLE_USER")
@PostMapping("/{author}/{slug}/manage/hardDelete")
public RedirectView delete(@PathVariable String author, @PathVariable String slug, RedirectAttributes ra) {
public ModelAndView delete(@PathVariable String author, @PathVariable String slug, RedirectAttributes ra) {
ProjectsTable project = projectsTable.get();
projectFactory.hardDeleteProject(project);
userActionLogService.project(request, LoggedActionType.PROJECT_VISIBILITY_CHANGE.with(ProjectContext.of(project.getId())), "deleted", project.getVisibility().getName());
AlertUtil.showAlert(ra, AlertUtil.AlertType.SUCCESS, "project.deleted", project.getName());
projectService.refreshHomePage();
return new RedirectView(Routes.getRouteUrlOf("showHome"));
return Routes.SHOW_HOME.getRedirect();
}
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@ -443,7 +442,7 @@ public class ProjectsController extends HangarController {
projectDao.get().update(projData.getProject());
userActionLogService.project(request, LoggedActionType.PROJECT_RENAMED.with(ProjectContext.of(projData.getProject().getId())), author + "/" + compactNewName, author + "/" + oldName);
projectService.refreshHomePage();
return new RedirectView(Routes.getRouteUrlOf("projects.show", author, newName));
return Routes.PROJECTS_SHOW.getRedirect(author, newName);
}
@ProjectPermission(NamedPermission.EDIT_SUBJECT_SETTINGS)

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

@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.papermc.hangar.config.CacheConfig;
import io.papermc.hangar.config.hangar.HangarConfig;
import io.papermc.hangar.controller.forms.NewVersion;
import io.papermc.hangar.db.customtypes.LoggedActionType;
import io.papermc.hangar.db.customtypes.LoggedActionType.VersionContext;
import io.papermc.hangar.db.dao.HangarDao;
@ -21,11 +22,12 @@ import io.papermc.hangar.model.DownloadType;
import io.papermc.hangar.model.NamedPermission;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.generated.ReviewState;
import io.papermc.hangar.model.viewhelpers.ProjectData;
import io.papermc.hangar.model.viewhelpers.ScopedProjectData;
import io.papermc.hangar.model.viewhelpers.VersionData;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import io.papermc.hangar.security.annotations.GlobalPermission;
import io.papermc.hangar.security.annotations.ProjectPermission;
import io.papermc.hangar.security.annotations.UserLock;
@ -33,7 +35,6 @@ import io.papermc.hangar.service.DownloadsService;
import io.papermc.hangar.service.StatsService;
import io.papermc.hangar.service.UserActionLogService;
import io.papermc.hangar.service.VersionService;
import io.papermc.hangar.service.plugindata.PluginFileWithData;
import io.papermc.hangar.service.pluginupload.PendingVersion;
import io.papermc.hangar.service.pluginupload.PluginUploadService;
import io.papermc.hangar.service.pluginupload.ProjectFiles;
@ -45,6 +46,7 @@ import io.papermc.hangar.util.AlertUtil.AlertType;
import io.papermc.hangar.util.FileUtils;
import io.papermc.hangar.util.RequestUtil;
import io.papermc.hangar.util.Routes;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.CacheManager;
import org.springframework.context.MessageSource;
@ -64,6 +66,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.ModelAndView;
@ -216,7 +219,7 @@ public class VersionsController extends HangarController {
PendingVersion pendingVersion;
try {
pendingVersion = pluginUploadService.processSubsequentPluginUpload(file, projData.getProjectOwner(), projData.getProject());
pendingVersion = pluginUploadService.processSubsequentPluginUpload(file, getCurrentUser(), projData.getProject());
} catch (HangarException e) {
ModelAndView mav = _showCreator(author, slug, null);
AlertUtil.showAlert(mav, AlertUtil.AlertType.ERROR, e.getMessageKey(), e.getArgs());
@ -243,6 +246,7 @@ public class VersionsController extends HangarController {
null,
null,
null,
"",
projData.getProject().getId(),
null,
null,
@ -252,8 +256,8 @@ public class VersionsController extends HangarController {
channel.getColor(),
null,
externalUrl,
false
);
false,
versionService.getMostRelevantVersion(projData.getProject()));
return _showCreator(author, slug, pendingVersion);
}
@ -310,6 +314,111 @@ public class VersionsController extends HangarController {
}
}
@ProjectPermission(NamedPermission.CREATE_VERSION)
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@Secured("ROLE_USER")
@PostMapping(value = "/{author}/{slug}/versions/new/{version:.+}", consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseStatus(HttpStatus.OK)
public void saveNewVersion(@PathVariable String author, @PathVariable String slug, @PathVariable("version") String versionName, @RequestBody NewVersion newVersion) {
ProjectsTable project = projectsTable.get();
cacheManager.getCache(CacheConfig.NEW_VERSION_CACHE).put(project.getId() + "/" + versionName, newVersion);
}
@ProjectPermission(NamedPermission.CREATE_VERSION)
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@Secured("ROLE_USER")
@PostMapping(value = "/{author}/{slug}/versions/{version:.+}")
public ModelAndView publish(@PathVariable String author, @PathVariable String slug, @PathVariable("version") String versionName, RedirectAttributes attributes) {
ProjectsTable project = projectsTable.get();
PendingVersion pendingVersion = cacheManager.getCache(CacheConfig.PENDING_VERSION_CACHE).get(project.getId() + "/" + versionName, PendingVersion.class);
NewVersion newVersion = cacheManager.getCache(CacheConfig.NEW_VERSION_CACHE).get(project.getId() + "/" + versionName, NewVersion.class);
if (newVersion == null || (pendingVersion == null && newVersion.getExternalUrl() == null)) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST);
} else if (pendingVersion == null && newVersion.getExternalUrl() != null) {
pendingVersion = new PendingVersion(
newVersion.getVersionString(),
null,
null,
"",
project.getId(),
null,
null,
null,
getCurrentUser().getId(),
newVersion.getChannel().getName(),
newVersion.getChannel().getColor(),
null,
newVersion.getExternalUrl(),
newVersion.isForumSync(),
null
);
}
return __publish(attributes, author, slug, versionName, newVersion, pendingVersion);
}
private ModelAndView __publish(RedirectAttributes attributes, String author, String slug, String versionName, @NotNull NewVersion newVersion, @NotNull PendingVersion pendingVersion) {
ProjectData projData = projectData.get();
if (newVersion.getPlatformDependencies().stream().anyMatch(s -> !s.getPlatform().getPossibleVersions().containsAll(s.getVersions()))) {
AlertUtil.showAlert(attributes, AlertType.ERROR, "error.plugin.invalidVersion");
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
List<ProjectChannelsTable> projectChannels = channelService.getProjectChannels(projData.getProject().getId());
String alertMsg = null;
String[] alertArgs = new String[0];
Optional<ProjectChannelsTable> channelOptional = projectChannels.stream().filter(ch -> ch.getName().equals(newVersion.getChannel().getName().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() == newVersion.getChannel().getColor())) {
alertMsg = "error.channel.duplicateColor";
}
if (alertMsg != null) {
AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, alertMsg, alertArgs);
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
channel = channelService.addProjectChannel(projData.getProject().getId(), newVersion.getChannel().getName().trim(), newVersion.getChannel().getColor(), newVersion.getChannel().isNonReviewed());
} else {
channel = channelOptional.get();
}
newVersion.getChannel().setColor(channel.getColor());
newVersion.getChannel().setName(channel.getName());
newVersion.getChannel().setNonReviewed(channel.getIsNonReviewed());
PendingVersion updatedVersion = pendingVersion.update(newVersion);
if (versionService.exists(updatedVersion)) {
AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, "error.plugin.versionExists");
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
ProjectVersionsTable version;
try {
version = updatedVersion.complete(request, projData, projectFactory);
} catch (HangarException e) {
AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, e.getMessage(), e.getArgs());
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
if (newVersion.isRecommended()) {
projData.getProject().setRecommendedVersionId(version.getId());
projectDao.get().update(projData.getProject());
}
if (newVersion.isUnstable()) {
versionService.addUnstableTag(version.getId());
}
userActionLogService.version(request, LoggedActionType.VERSION_UPLOADED.with(VersionContext.of(projData.getProject().getId(), version.getId())), "published", "");
cacheManager.getCache(CacheConfig.NEW_VERSION_CACHE).evict(projData.getProject().getId() + "/" + versionName);
cacheManager.getCache(CacheConfig.PENDING_VERSION_CACHE).evict(projData.getProject().getId() + "/" + versionName);
return Routes.VERSIONS_SHOW.getRedirect(author, slug, versionName);
}
@ProjectPermission(NamedPermission.CREATE_VERSION)
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@Secured("ROLE_USER")
@ -332,7 +441,8 @@ public class VersionsController extends HangarController {
ProjectsTable project = projectsTable.get();
PendingVersion pendingVersion = new PendingVersion(
versionString,
List.of(new Dependency(platform.getDependencyId(), String.join(",", versions), true)),
new VersionDependencies(),
List.of(new PlatformDependency(platform, versions)),
versionDescription,
project.getId(),
null,
@ -343,12 +453,12 @@ public class VersionsController extends HangarController {
channelColorInput,
null,
externalUrl,
forumPost
);
return _publish(author, slug, versionString, unstable, recommended, channelInput, channelColorInput, versions, forumPost, nonReviewed,content, pendingVersion, platform, attributes);
forumPost,
versionService.getMostRelevantVersion(project));
return _publish(author, slug, versionString, unstable, recommended, channelInput, channelColorInput, forumPost, nonReviewed,content, pendingVersion, attributes, pendingVersion.getPlatforms());
}
private ModelAndView _publish(String author, String slug, String versionName, boolean unstable, boolean recommended, String channelInput, Color channelColorInput, List<String> versions, boolean forumPost, boolean isNonReviewed, String content, PendingVersion pendingVersion, Platform platform, RedirectAttributes attributes) {
private ModelAndView _publish(String author, String slug, String versionName, boolean unstable, boolean recommended, String channelInput, Color channelColorInput, boolean forumPost, boolean isNonReviewed, String content, PendingVersion pendingVersion, RedirectAttributes attributes, List<PlatformDependency> platformDependencies) {
ProjectData projData = projectData.get();
Color channelColor = channelColorInput == null ? hangarConfig.channels.getColorDefault() : channelColorInput;
@ -357,7 +467,7 @@ public class VersionsController extends HangarController {
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
if (versions.stream().anyMatch(s -> !platform.getPossibleVersions().contains(s))) {
if (platformDependencies.stream().anyMatch(s -> !s.getPlatform().getPossibleVersions().containsAll(s.getVersions()))) {
AlertUtil.showAlert(attributes, AlertType.ERROR, "error.plugin.invalidVersion");
return Routes.VERSIONS_SHOW_CREATOR.getRedirect(author, slug);
}
@ -388,8 +498,7 @@ public class VersionsController extends HangarController {
channel.getColor(),
forumPost,
content,
versions,
platform
platformDependencies
);
if (versionService.exists(newPendingVersion)) {
@ -420,40 +529,39 @@ public class VersionsController extends HangarController {
}
@ProjectPermission(NamedPermission.CREATE_VERSION)
@UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
@Secured("ROLE_USER")
@PostMapping(value = "/{author}/{slug}/versions/{version:.+}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
public ModelAndView publish(@PathVariable String author,
@PathVariable String slug,
@PathVariable("version") String versionName,
@RequestParam(defaultValue = "false") boolean unstable,
@RequestParam(defaultValue = "false") boolean recommended,
@RequestParam("channel-input") String channelInput,
@RequestParam(value = "channel-color-input", required = false) Color channelColorInput,
@RequestParam(value = "non-reviewed", defaultValue = "false") boolean nonReviewed,
@RequestParam(value = "forum-post", defaultValue = "false") boolean forumPost,
@RequestParam(required = false) String content,
@RequestParam List<String> versions,
RedirectAttributes attributes) {
ProjectsTable project = projectsTable.get();
PendingVersion pendingVersion = cacheManager.getCache(CacheConfig.PENDING_VERSION_CACHE).get(project.getId() + "/" + versionName, PendingVersion.class);
return _publish(author,
slug,
versionName,
unstable,
recommended,
channelInput,
channelColorInput,
versions,
forumPost,
nonReviewed,
content,
pendingVersion,
Optional.ofNullable(pendingVersion).map(PendingVersion::getPlugin).map(PluginFileWithData::getPlatform).orElse(null),
attributes
);
}
// @ProjectPermission(NamedPermission.CREATE_VERSION)
// @UserLock(route = Routes.PROJECTS_SHOW, args = "{#author, #slug}")
// @Secured("ROLE_USER")
// @PostMapping(value = "/{author}/{slug}/versions/{version:.+}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
// public ModelAndView publish(@PathVariable String author,
// @PathVariable String slug,
// @PathVariable("version") String versionName,
// @RequestParam(defaultValue = "false") boolean unstable,
// @RequestParam(defaultValue = "false") boolean recommended,
// @RequestParam("channel-input") String channelInput,
// @RequestParam(value = "channel-color-input", required = false) Color channelColorInput,
// @RequestParam(value = "non-reviewed", defaultValue = "false") boolean nonReviewed,
// @RequestParam(value = "forum-post", defaultValue = "false") boolean forumPost,
// @RequestParam(required = false) String content,
// @RequestParam List<String> versions,
// RedirectAttributes attributes) {
// ProjectsTable project = projectsTable.get();
// PendingVersion pendingVersion = cacheManager.getCache(CacheConfig.PENDING_VERSION_CACHE).get(project.getId() + "/" + versionName, PendingVersion.class);
// return _publish(author,
// slug,
// versionName,
// unstable,
// recommended,
// channelInput,
// channelColorInput,
// forumPost,
// nonReviewed,
// content,
// pendingVersion,
// attributes,
// Optional.ofNullable(pendingVersion).map(PendingVersion::getPlatforms).orElse(new ArrayList<>())
// );
// }
@GetMapping("/{author}/{slug}/versions/{version:.*}")
public ModelAndView show(@PathVariable String author, @PathVariable String slug, @PathVariable String version, ModelMap modelMap) {

156
src/main/java/io/papermc/hangar/controller/forms/NewVersion.java Normal file
View File

@ -0,0 +1,156 @@
package io.papermc.hangar.controller.forms;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.papermc.hangar.controller.forms.objects.Channel;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Objects;
public class NewVersion {
@JsonProperty(value = "channel", required = true)
private Channel channel;
@JsonProperty(value = "dependencies", required = true)
private VersionDependencies versionDependencies;
@JsonProperty("externalUrl")
private String externalUrl;
@JsonProperty(value = "forumSync", required = true)
private boolean forumSync;
@JsonProperty(value = "platforms", required = true)
private List<PlatformDependency> platformDependencies;
@JsonProperty(value = "recommended", required = true)
private boolean recommended;
@JsonProperty(value = "unstable", required = true)
private boolean unstable;
@JsonProperty(value = "versionString", required = true)
private String versionString;
@JsonProperty(value = "content", required = true)
private String content;
@NotNull
public Channel getChannel() {
return channel;
}
public void setChannel(Channel channel) {
this.channel = channel;
}
@NotNull
public VersionDependencies getVersionDependencies() {
return versionDependencies;
}
public void setVersionDependencies(VersionDependencies versionDependencies) {
this.versionDependencies = versionDependencies;
}
@Nullable
public String getExternalUrl() {
return externalUrl;
}
public void setExternalUrl(String externalUrl) {
this.externalUrl = externalUrl;
}
public boolean isForumSync() {
return forumSync;
}
public void setForumSync(boolean forumSync) {
this.forumSync = forumSync;
}
@NotNull
public List<PlatformDependency> getPlatformDependencies() {
return platformDependencies;
}
public void setPlatformDependencies(List<PlatformDependency> platformDependencies) {
this.platformDependencies = platformDependencies;
}
public boolean isRecommended() {
return recommended;
}
public void setRecommended(boolean recommended) {
this.recommended = recommended;
}
public boolean isUnstable() {
return unstable;
}
public void setUnstable(boolean unstable) {
this.unstable = unstable;
}
@NotNull
public String getVersionString() {
return versionString;
}
public void setVersionString(String versionString) {
this.versionString = versionString;
}
@NotNull
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
@Override
public String toString() {
return "NewVersion{" +
"channel=" + channel +
", versionDependencies=" + versionDependencies +
", externalUrl='" + externalUrl + '\'' +
", forumSync=" + forumSync +
", platformDependencies=" + platformDependencies +
", recommended=" + recommended +
", unstable=" + unstable +
", versionString='" + versionString + '\'' +
", content='" + content + '\'' +
'}';
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NewVersion that = (NewVersion) o;
return forumSync == that.forumSync &&
recommended == that.recommended &&
unstable == that.unstable &&
channel.equals(that.channel) &&
versionDependencies.equals(that.versionDependencies) &&
Objects.equals(externalUrl, that.externalUrl) &&
platformDependencies.equals(that.platformDependencies) &&
versionString.equals(that.versionString) &&
content.equals(that.content);
}
@Override
public int hashCode() {
return Objects.hash(channel, versionDependencies, externalUrl, forumSync, platformDependencies, recommended, unstable, versionString, content);
}
}

69
src/main/java/io/papermc/hangar/controller/forms/objects/Channel.java Normal file
View File

@ -0,0 +1,69 @@
package io.papermc.hangar.controller.forms.objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.papermc.hangar.model.Color;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class Channel {
@JsonProperty(value = "color", required = true)
private Color color;
@JsonProperty(value = "name", required = true)
private String name;
@JsonProperty(value = "nonReviewed")
private boolean nonReviewed = false;
@NotNull
public Color getColor() {
return color;
}
public void setColor(Color color) {
this.color = color;
}
@NotNull
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Channel channel = (Channel) o;
return nonReviewed == channel.nonReviewed &&
color == channel.color &&
name.equals(channel.name);
}
@Override
public int hashCode() {
return Objects.hash(color, name, nonReviewed);
}
public boolean isNonReviewed() {
return nonReviewed;
}
public void setNonReviewed(boolean nonReviewed) {
this.nonReviewed = nonReviewed;
}
@Override
public String toString() {
return "Channel{" +
"color=" + color +
", name='" + name + '\'' +
", nonReviewed=" + nonReviewed +
'}';
}
}

2
src/main/java/io/papermc/hangar/db/customtypes/JSONB.java
View File

@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ContainerNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.postgresql.util.PGobject;
public class JSONB extends PGobject {

15
src/main/java/io/papermc/hangar/db/dao/ProjectVersionDao.java
View File

@ -1,11 +1,15 @@
package io.papermc.hangar.db.dao;
import io.papermc.hangar.db.customtypes.JSONB;
import io.papermc.hangar.db.mappers.DependencyMapper;
import io.papermc.hangar.db.mappers.PlatformDependencyMapper;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import io.papermc.hangar.db.model.ProjectVersionsTable;
import io.papermc.hangar.model.generated.ReviewState;
import io.papermc.hangar.model.viewhelpers.ReviewQueueEntry;
import org.jdbi.v3.core.enums.EnumByOrdinal;
import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
import org.jdbi.v3.sqlobject.config.RegisterColumnMapper;
import org.jdbi.v3.sqlobject.customizer.BindBean;
import org.jdbi.v3.sqlobject.customizer.Timestamped;
import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys;
@ -17,6 +21,8 @@ import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
@RegisterColumnMapper(DependencyMapper.class)
@RegisterColumnMapper(PlatformDependencyMapper.class)
@RegisterBeanMapper(ProjectVersionsTable.class)
@RegisterBeanMapper(ProjectVersionTagsTable.class)
public interface ProjectVersionDao {
@ -24,9 +30,9 @@ public interface ProjectVersionDao {
@Timestamped
@GetGeneratedKeys
@SqlUpdate("INSERT INTO project_versions " +
"(created_at, version_string, dependencies, description, project_id, channel_id, file_size, hash, file_name, author_id, create_forum_post, external_url) VALUES " +
"(:now, :versionString, :dependencies, :description, :projectId, :channelId, :fileSize, :hash, :fileName, :authorId, :createForumPost, :externalUrl)")
ProjectVersionsTable insert(@BindBean ProjectVersionsTable projectVersionsTable);
"(created_at, version_string, dependencies, platforms, description, project_id, channel_id, file_size, hash, file_name, author_id, create_forum_post, external_url) VALUES " +
"(:now, :versionString, :dependenciesJson, :platformsJson, :description, :projectId, :channelId, :fileSize, :hash, :fileName, :authorId, :createForumPost, :externalUrl)")
ProjectVersionsTable insert(@BindBean ProjectVersionsTable projectVersionsTable, JSONB dependenciesJson, JSONB platformsJson);
@SqlUpdate("UPDATE project_versions SET visibility = :visibility, reviewer_id = :reviewerId, approved_at = :approvedAt, description = :description, " +
"review_state = :reviewState, external_url = :externalUrl " +
@ -76,6 +82,9 @@ public interface ProjectVersionDao {
" ORDER BY sq.project_name DESC, sq.version_string DESC")
List<ReviewQueueEntry> getQueue(@EnumByOrdinal ReviewState reviewState);
@SqlQuery("SELECT * FROM project_versions WHERE project_id = :projectId ORDER BY created_at LIMIT 1")
ProjectVersionsTable getMostRecentVersion(long projectId);
@SqlQuery("SELECT * FROM project_versions WHERE project_id = :projectId AND (hash = :hash OR lower(version_string) = lower(:versionString))")
ProjectVersionsTable getProjectVersion(long projectId, String hash, String versionString);

3
src/main/java/io/papermc/hangar/db/dao/api/ProjectsApiDao.java
View File

@ -24,7 +24,8 @@ import java.util.Map;
public interface ProjectsApiDao {
@UseStringTemplateEngine
@SqlQuery("SELECT p.created_at," +
@SqlQuery("SELECT p.id," +
" p.created_at," +
" p.name," +
" p.owner_name \"owner\"," +
" p.slug," +

7
src/main/java/io/papermc/hangar/db/dao/api/V1ApiDao.java
View File

@ -1,5 +1,7 @@
package io.papermc.hangar.db.dao.api;
import io.papermc.hangar.db.mappers.DependencyMapper;
import io.papermc.hangar.db.mappers.PlatformDependencyMapper;
import io.papermc.hangar.db.model.ProjectChannelsTable;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import io.papermc.hangar.db.model.ProjectVersionsTable;
@ -9,6 +11,7 @@ import io.papermc.hangar.db.model.UserProjectRolesTable;
import io.papermc.hangar.db.model.UsersTable;
import org.jdbi.v3.sqlobject.config.KeyColumn;
import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
import org.jdbi.v3.sqlobject.config.RegisterColumnMapper;
import org.jdbi.v3.sqlobject.config.ValueColumn;
import org.jdbi.v3.sqlobject.customizer.BindList;
import org.jdbi.v3.sqlobject.customizer.BindList.EmptyHandling;
@ -51,6 +54,8 @@ public interface V1ApiDao {
@UseStringTemplateEngine
@RegisterBeanMapper(ProjectVersionsTable.class)
@RegisterColumnMapper(DependencyMapper.class)
@RegisterColumnMapper(PlatformDependencyMapper.class)
@SqlQuery("SELECT pv.* " +
" FROM project_versions pv" +
" JOIN projects p ON pv.project_id = p.id" +
@ -78,6 +83,8 @@ public interface V1ApiDao {
@KeyColumn("p_id")
@RegisterBeanMapper(ProjectVersionsTable.class)
@RegisterColumnMapper(DependencyMapper.class)
@RegisterColumnMapper(PlatformDependencyMapper.class)
@SqlQuery("SELECT p.id p_id, pv.* FROM project_versions pv JOIN projects p ON pv.project_id = p.id WHERE p.recommended_version_id = pv.id AND p.id IN (<projectIds>)")
Map<Long, ProjectVersionsTable> getProjectsRecommendedVersion(@BindList(onEmpty = EmptyHandling.NULL_STRING) List<Long> projectIds);

8
src/main/java/io/papermc/hangar/db/dao/api/VersionsApiDao.java
View File

@ -1,10 +1,12 @@
package io.papermc.hangar.db.dao.api;
import io.papermc.hangar.db.dao.api.mappers.VersionMapper;
import io.papermc.hangar.db.mappers.DependencyMapper;
import io.papermc.hangar.model.generated.Version;
import io.papermc.hangar.model.generated.VersionStatsDay;
import org.jdbi.v3.sqlobject.config.KeyColumn;
import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
import org.jdbi.v3.sqlobject.config.RegisterColumnMapper;
import org.jdbi.v3.sqlobject.config.RegisterRowMapper;
import org.jdbi.v3.sqlobject.customizer.BindList;
import org.jdbi.v3.sqlobject.customizer.BindList.EmptyHandling;
@ -22,6 +24,7 @@ import java.util.Map;
public interface VersionsApiDao {
@UseStringTemplateEngine
@RegisterColumnMapper(DependencyMapper.class)
@SqlQuery("SELECT pv.created_at," +
"pv.version_string," +
"pv.dependencies," +
@ -50,6 +53,7 @@ public interface VersionsApiDao {
"ORDER BY pv.created_at DESC LIMIT 1")
Version getVersion(String author, String slug, String versionString, @Define boolean canSeeHidden, @Define Long userId);
@RegisterColumnMapper(DependencyMapper.class)
@UseStringTemplateEngine
@SqlQuery("SELECT pv.created_at," +
"pv.version_string," +
@ -63,8 +67,8 @@ public interface VersionsApiDao {
"u.name author," +
"pv.review_state," +
"array_append(array_agg(pvt.name ORDER BY (pvt.name)) FILTER ( WHERE pvt.name IS NOT NULL ), 'Channel') AS tag_name," +
"array_append(array_agg(pvt.data ORDER BY (pvt.name)) FILTER ( WHERE pvt.name IS NOT NULL ), pc.name) AS tag_data," +
"array_append(array_agg(pvt.color ORDER BY (pvt.name)) FILTER ( WHERE pvt.name IS NOT NULL ), pc.color + 9) AS tag_color " +
"array_append(array_agg(array_to_string(pvt.data, ', ') ORDER BY (pvt.name)) FILTER ( WHERE pvt.name IS NOT NULL ), pc.name::text) AS tag_data," +
"array_append(array_agg(pvt.color ORDER BY (pvt.name)) FILTER ( WHERE pvt.name IS NOT NULL ), pc.color) AS tag_color " +
"FROM projects p" +
" JOIN project_versions pv ON p.id = pv.project_id" +
" LEFT JOIN users u ON pv.author_id = u.id" +

40
src/main/java/io/papermc/hangar/db/dao/api/mappers/VersionMapper.java
View File

@ -1,11 +1,15 @@
package io.papermc.hangar.db.dao.api.mappers;
import io.papermc.hangar.model.Color;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.FileInfo;
import io.papermc.hangar.model.generated.ReviewState;
import io.papermc.hangar.model.generated.Tag;
import io.papermc.hangar.model.generated.TagColor;
import io.papermc.hangar.model.generated.Version;
import io.papermc.hangar.model.generated.VersionStatsAll;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import io.papermc.hangar.util.StringUtils;
import org.jdbi.v3.core.mapper.ColumnMapper;
import org.jdbi.v3.core.mapper.RowMapper;
import org.jdbi.v3.core.statement.StatementContext;
@ -13,24 +17,50 @@ import org.jdbi.v3.core.statement.StatementContext;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
public class VersionMapper implements RowMapper<Version> {
@Override
public Version map(ResultSet rs, StatementContext ctx) throws SQLException {
Optional<ColumnMapper<String[]>> mapper = ctx.findColumnMapperFor(String[].class);
if (mapper.isEmpty()) throw new UnsupportedOperationException("couldn't find a mapper for String[]");
Optional<ColumnMapper<VersionDependencies>> versionDependenciesColumnMapper = ctx.findColumnMapperFor(VersionDependencies.class);
if (mapper.isEmpty() || versionDependenciesColumnMapper.isEmpty()) throw new UnsupportedOperationException("couldn't find required mappers");
String[] tagNames = (String[]) rs.getArray("tag_name").getArray();
String[] tagData = (String[]) rs.getArray("tag_data").getArray();
Integer[] tagColors = (Integer[]) rs.getArray("tag_color").getArray();
if (tagNames.length != tagColors.length || tagData.length != tagColors.length) {
throw new IllegalArgumentException("All 3 tag arrays must be the same length");
}
List<Tag> tags = new ArrayList<>();
for (int i = 0; i < tagNames.length; i++) {
io.papermc.hangar.model.TagColor tagColor = io.papermc.hangar.model.TagColor.getByName(tagNames[i]);
Tag newTag = new Tag().name(tagNames[i]);
if (tagData[i] != null) {
newTag.data(StringUtils.formatVersionNumbers(Arrays.asList(tagData[i].split(", "))));
}
if (tagColor != null) {
tags.add(newTag.color(new TagColor().foreground(tagColor.getForeground()).background(tagColor.getBackground())));
} else {
Color color = Color.getValues()[tagColors[i]];
tags.add(newTag.color(new TagColor().background(color.getHex())));
}
}
return new Version()
.createdAt(rs.getObject("created_at", OffsetDateTime.class))
.name(rs.getString("version_string"))
.dependencies(Dependency.from(Arrays.asList(mapper.get().map(rs, "dependencies", ctx))))
.dependencies(versionDependenciesColumnMapper.get().map(rs, rs.findColumn("dependencies"), ctx))
.visibility(Visibility.fromId(rs.getLong("visibility")))
.description(rs.getString("description"))
.stats(new VersionStatsAll().downloads(rs.getLong("downloads")))
.fileInfo(new FileInfo().name(rs.getString("fi_name")).md5Hash(rs.getString("fi_md5_hash")).sizeBytes(rs.getLong("fi_size_bytes")))
.author(rs.getString("author"))
.reviewState(ReviewState.values()[rs.getInt("review_state")]);
.reviewState(ReviewState.values()[rs.getInt("review_state")])
.tags(tags);
}
}

45
src/main/java/io/papermc/hangar/db/mappers/DependencyMapper.java Normal file
View File

@ -0,0 +1,45 @@
package io.papermc.hangar.db.mappers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.papermc.hangar.db.customtypes.JSONB;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import org.jdbi.v3.core.mapper.ColumnMapper;
import org.jdbi.v3.core.statement.StatementContext;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
public class DependencyMapper implements ColumnMapper<VersionDependencies> {
private final ObjectMapper mapper = new ObjectMapper();
@Override
public VersionDependencies map(ResultSet r, int columnNumber, StatementContext ctx) throws SQLException {
ObjectNode objectNode = (ObjectNode) r.getObject(columnNumber, JSONB.class).getJson();
VersionDependencies platformListMap = new VersionDependencies();
objectNode.fields().forEachRemaining(stringJsonNodeEntry -> {
ArrayNode depArray = (ArrayNode) stringJsonNodeEntry.getValue();
List<Dependency> dependencies = new ArrayList<>();
try {
for (JsonNode depObj : depArray) {
dependencies.add(mapper.treeToValue(depObj, Dependency.class));
}
} catch (JsonProcessingException exception) {
exception.printStackTrace();
}
platformListMap.put(Platform.valueOf(stringJsonNodeEntry.getKey()), dependencies);
});
return platformListMap;
}
}

34
src/main/java/io/papermc/hangar/db/mappers/PlatformDependencyMapper.java Normal file
View File

@ -0,0 +1,34 @@
package io.papermc.hangar.db.mappers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import io.papermc.hangar.db.customtypes.JSONB;
import io.papermc.hangar.model.generated.PlatformDependency;
import org.jdbi.v3.core.mapper.ColumnMapper;
import org.jdbi.v3.core.statement.StatementContext;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
public class PlatformDependencyMapper implements ColumnMapper<List<PlatformDependency>> {
private final ObjectMapper mapper = new ObjectMapper();
@Override
public List<PlatformDependency> map(ResultSet r, int columnNumber, StatementContext ctx) throws SQLException {
ArrayNode platformDepsArray = (ArrayNode) r.getObject(columnNumber, JSONB.class).getJson();
List<PlatformDependency> platformDependencies = new ArrayList<>();
try {
for (JsonNode platformDepObj : platformDepsArray) {
platformDependencies.add(mapper.treeToValue(platformDepObj, PlatformDependency.class));
}
} catch (JsonProcessingException e) {
e.printStackTrace();
}
return platformDependencies;
}
}

2
src/main/java/io/papermc/hangar/db/mappers/PromotedVersionMapper.java
View File

@ -30,7 +30,7 @@ public class PromotedVersionMapper implements ColumnMapper<List<PromotedVersion>
String version = json.get("version_string").asText();
String tagName = json.get("tag_name").asText();
String data = stringOrNull(json.get("tag_version"));
TagColor color = TagColor.VALUES[json.get("tag_color").asInt()];
TagColor color = TagColor.getValues()[json.get("tag_color").asInt()];
// TODO a whole bunch
// val displayAndMc = data.map { rawData =>
// lazy val lowerBoundVersion = for {

10
src/main/java/io/papermc/hangar/db/model/ProjectVersionTagsTable.java
View File

@ -4,15 +4,17 @@ import io.papermc.hangar.model.TagColor;
import org.jdbi.v3.core.enums.EnumByOrdinal;
import java.util.List;
public class ProjectVersionTagsTable {
private long id;
private long versionId;
private String name;
private String data;
private List<String> data;
private TagColor color;
public ProjectVersionTagsTable(long id, long versionId, String name, String data, TagColor color) {
public ProjectVersionTagsTable(long id, long versionId, String name, List<String> data, TagColor color) {
this.id = id;
this.versionId = versionId;
this.name = name;
@ -49,11 +51,11 @@ public class ProjectVersionTagsTable {
}
public String getData() {
public List<String> getData() {
return data;
}
public void setData(String data) {
public void setData(List<String> data) {
this.data = data;
}

25
src/main/java/io/papermc/hangar/db/model/ProjectVersionsTable.java
View File

@ -2,7 +2,9 @@ package io.papermc.hangar.db.model;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.generated.ReviewState;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import org.jdbi.v3.core.annotation.Unmappable;
import org.jdbi.v3.core.enums.EnumByOrdinal;
@ -14,7 +16,7 @@ public class ProjectVersionsTable {
private long id;
private OffsetDateTime createdAt;
private String versionString;
private List<String> dependencies;
private VersionDependencies dependencies;
private String description;
private long projectId;
private long channelId;
@ -29,8 +31,9 @@ public class ProjectVersionsTable {
private boolean createForumPost = true;
private Long postId;
private String externalUrl;
private List<PlatformDependency> platforms;
public ProjectVersionsTable(String versionString, List<String> dependencies, String description, long projectId, long channelId, Long fileSize, String hash, String fileName, long authorId, boolean createForumPost, String externalUrl) {
public ProjectVersionsTable(String versionString, VersionDependencies dependencies, String description, long projectId, long channelId, Long fileSize, String hash, String fileName, long authorId, boolean createForumPost, String externalUrl, List<PlatformDependency> platforms) {
this.versionString = versionString;
this.dependencies = dependencies;
this.description = description;
@ -42,6 +45,7 @@ public class ProjectVersionsTable {
this.authorId = authorId;
this.createForumPost = createForumPost;
this.externalUrl = externalUrl;
this.platforms = platforms;
}
public ProjectVersionsTable() { }
@ -73,11 +77,11 @@ public class ProjectVersionsTable {
}
public List<String> getDependencies() {
public VersionDependencies getDependencies() {
return dependencies;
}
public void setDependencies(List<String> dependencies) {
public void setDependencies(VersionDependencies dependencies) {
this.dependencies = dependencies;
}
@ -211,6 +215,15 @@ public class ProjectVersionsTable {
this.externalUrl = externalUrl;
}
public List<PlatformDependency> getPlatforms() {
return platforms;
}
public void setPlatforms(List<PlatformDependency> platforms) {
this.platforms = platforms;
}
@Unmappable
public boolean isExternal() {
return this.externalUrl != null && this.fileName == null;
@ -222,7 +235,6 @@ public class ProjectVersionsTable {
"id=" + id +
", createdAt=" + createdAt +
", versionString='" + versionString + '\'' +
", dependencies=" + dependencies +
", description='" + description + '\'' +
", projectId=" + projectId +
", channelId=" + channelId +
@ -236,6 +248,9 @@ public class ProjectVersionsTable {
", reviewState=" + reviewState +
", createForumPost=" + createForumPost +
", postId=" + postId +
", externalUrl='" + externalUrl + '\'' +
", dependencies=" + dependencies +
", platformDependencies=" + platforms +
'}';
}
}

13
src/main/java/io/papermc/hangar/model/Color.java
View File

@ -1,5 +1,11 @@
package io.papermc.hangar.model;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
import com.fasterxml.jackson.annotation.JsonProperty;
@JsonFormat(shape = Shape.OBJECT)
public enum Color {
PURPLE(0, "#B400FF"),
@ -38,7 +44,8 @@ public enum Color {
return hex;
}
public static Color getById(int id) {
@JsonCreator
public static Color getById(@JsonProperty("value") int id) {
return VALUES[id];
}
@ -48,4 +55,8 @@ public enum Color {
}
return null;
}
public static Color[] getValues() {
return VALUES;
}
}

43
src/main/java/io/papermc/hangar/model/Platform.java
View File

@ -1,9 +1,11 @@
package io.papermc.hangar.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
import io.papermc.hangar.db.dao.HangarDao;
import io.papermc.hangar.db.dao.PlatformVersionsDao;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.service.VersionService;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
@ -21,6 +23,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
@JsonFormat(shape = Shape.OBJECT)
public enum Platform {
PAPER("Paper", PlatformCategory.SERVER_CATEGORY, 0, "paperapi", TagColor.PAPER, "https://papermc.io/downloads"),
@ -85,7 +88,7 @@ public enum Platform {
this.platformVersionsDao = platformVersionsDao;
}
public ProjectVersionTagsTable createGhostTag(long versionId, String version) {
public ProjectVersionTagsTable createGhostTag(long versionId, List<String> version) {
return new ProjectVersionTagsTable(-1, versionId, name, version, tagColor);
}
@ -112,33 +115,31 @@ public enum Platform {
.collect(Collectors.toList());
}
public static List<Pair<Platform, ProjectVersionTagsTable>> getGhostTags(long versionId, List<Dependency> dependencies) {
return getPlatforms(
dependencies
.stream()
.map(Dependency::getPluginId)
.collect(Collectors.toList())
).stream().map(p -> new ImmutablePair<>(
p,
p.createGhostTag(
public static List<Pair<Platform, ProjectVersionTagsTable>> getGhostTags(long versionId, List<PlatformDependency> platformDependencies) {
return platformDependencies.stream().map(dep -> new ImmutablePair<>(
dep.getPlatform(),
dep.getPlatform().createGhostTag(
versionId,
dependencies
.stream()
.filter(d -> d.getPluginId().equalsIgnoreCase(p.dependencyId))
.findFirst()
.get()
.getVersion()
dep.getVersions()
)
)).collect(Collectors.toList());
}
@Nullable
public static Platform getByDependencyId(String dependencyId) {
return PLATFORMS_BY_DEPENDENDY.get(dependencyId.toLowerCase());
public static Platform getByName(@Nullable String name) {
if (name == null) {
return null;
}
for (Platform pl : VALUES) {
if (pl.name.equalsIgnoreCase(name)) {
return pl;
}
}
return null;
}
public static List<ProjectVersionTagsTable> createPlatformTags(VersionService versionService, long versionId, List<Dependency> dependencies) {
return versionService.insertTags(getGhostTags(versionId, dependencies).stream().map(Pair::getRight).collect(Collectors.toList()));
public static List<ProjectVersionTagsTable> createPlatformTags(VersionService versionService, long versionId, List<PlatformDependency> platformDependencies) {
return versionService.insertTags(getGhostTags(versionId, platformDependencies).stream().map(Pair::getRight).collect(Collectors.toList()));
}
public enum PlatformCategory {

26
src/main/java/io/papermc/hangar/model/TagColor.java
View File

@ -1,12 +1,17 @@
package io.papermc.hangar.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
import org.jetbrains.annotations.Nullable;
@JsonFormat(shape = Shape.OBJECT)
public enum TagColor { // remember, once we push to production, the order of these enums cannot change
PAPER("#F7CF0D", "#333333"),
WATERFALL("#F7CF0D", "#333333"),
VELOCITY("#039BE5","#333333"),
UNSTABLE("#FFDAB9", "#333333");
UNSTABLE("#F54242", "#333333");
private final String background;
private final String foreground;
@ -24,5 +29,22 @@ public enum TagColor { // remember, once we push to production, the order of the
return foreground;
}
public static final TagColor[] VALUES = TagColor.values();
private static final TagColor[] VALUES = TagColor.values();
public static TagColor[] getValues() {
return VALUES;
}
@Nullable
public static TagColor getByName(@Nullable String name) {
if (name == null) {
return null;
}
for (TagColor color : VALUES) {
if (color.name().equalsIgnoreCase(name)) {
return color;
}
}
return null;
}
}

166
src/main/java/io/papermc/hangar/model/generated/Dependency.java
View File

@ -1,73 +1,55 @@
package io.papermc.hangar.model.generated;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.validation.annotation.Validated;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModelProperty;
/**
* ModelsProtocolsAPIV2VersionDependency
*/
@Validated
public class Dependency {
//TODO dependency identification
@JsonProperty("plugin_id")
private String pluginId = null;
@JsonProperty(value = "name", required = true)
private String name;
@JsonProperty("version")
private String version = null;
@JsonProperty(value = "required", required = true)
private boolean required;
@JsonProperty("required")
private boolean required = true;
@JsonProperty("project_id")
private Long projectId;
public Dependency(String pluginId, String version) {
this(pluginId, version, true);
}
@JsonProperty("external_url")
private String externalUrl;
public Dependency(String pluginId, String version, boolean required) {
this.pluginId = pluginId;
this.version = version;
public Dependency(String name, boolean required) {
this.name = name;
this.required = required;
}
public Dependency() {
//
}
public Dependency() { }
@ApiModelProperty(required = true, value = "")
/**
* Get dependency name
* @return name
*/
@NotNull
@Deprecated
public String getPluginId() {
return pluginId;
@ApiModelProperty(required = true, name = "Name as it appears in plugin.yml")
public String getName() {
return name;
}
public void setPluginId(String pluginId) {
this.pluginId = pluginId;
public void setName(String name) {
this.name = name;
}
/**
* Get version
*
* @return version
**/
@ApiModelProperty(value = "")
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
* Is dependency required
* @return is required
*/
@ApiModelProperty(required = true, name = "Required dependency")
public boolean isRequired() {
return required;
}
@ -76,55 +58,67 @@ public class Dependency {
this.required = required;
}
/**
* Get Hangar projectId
*
* @return project id (if applicable)
*/
@Nullable
@ApiModelProperty("Hangar project id (if applicable)")
public Long getProjectId() {
return projectId;
}
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
/**
* Get External URL
* @return external url (if applicable)
*/
@Nullable
@ApiModelProperty("External URL (if applicable)")
public String getExternalUrl() {
return externalUrl;
}
public void setExternalUrl(String externalUrl) {
this.externalUrl = externalUrl;
}
/**
* Dependency has either a projectId or an externalUrl
* @return true if projectId is not null or externalUrl is not null
*/
@JsonIgnore
public boolean isLinked() {
return this.externalUrl != null || this.projectId != null;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Dependency dependency = (Dependency) o;
return Objects.equals(this.pluginId, dependency.pluginId) &&
Objects.equals(this.version, dependency.version);
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Dependency that = (Dependency) o;
return required == that.required &&
name.equals(that.name) &&
Objects.equals(projectId, that.projectId) &&
Objects.equals(externalUrl, that.externalUrl);
}
@Override
public int hashCode() {
return Objects.hash(pluginId, version);
return Objects.hash(name, required, projectId, externalUrl);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ModelsProtocolsAPIV2VersionDependency {\n");
sb.append(" pluginId: ").append(toIndentedString(pluginId)).append("\n");
sb.append(" version: ").append(toIndentedString(version)).append("\n");
sb.append("}");
return sb.toString();
return "Dependency{" +
"name='" + name + '\'' +
", required=" + required +
", projectId=" + projectId +
", externalUrl='" + externalUrl + '\'' +
'}';
}
/**
* Convert the given object to string with each line indented by 4 spaces (except the first line).
*/
private String toIndentedString(Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
public static List<Dependency> from(List<String> dependencies) {
return dependencies.stream().map(Dependency::fromString).collect(Collectors.toList());
}
private static Dependency fromString(String dep) {
if (dep.contains(":")) {
return new Dependency(dep.split(":")[0], dep.split(":")[1]);
} else {
return new Dependency(dep, null);
}
}
}

114
src/main/java/io/papermc/hangar/model/generated/PlatformDependency.java Normal file
View File

@ -0,0 +1,114 @@
package io.papermc.hangar.model.generated;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonFormat.Shape;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.util.StringUtils;
import io.swagger.annotations.ApiModelProperty;
import org.jetbrains.annotations.NotNull;
import org.springframework.validation.annotation.Validated;
import java.util.List;
import java.util.Objects;
@Validated
public class PlatformDependency {
@JsonProperty(value = "name", required = true)
@JsonFormat(shape = Shape.STRING)
private Platform platform;
@JsonProperty(value = "versions", required = true)
private List<String> versions;
@JsonProperty("formatted_versions")
private final String formattedVersion;
public PlatformDependency(Platform platform, List<String> versions) {
this.platform = platform;
this.versions = versions;
this.formattedVersion = PlatformDependency.formatVersions(this.versions);
}
@JsonCreator
public PlatformDependency(@JsonProperty(value = "name", required = true) Platform platform, @JsonProperty(value = "versions", required = true) List<String> versions, @JsonProperty("formatted_versions") String formattedVersion) {
this.platform = platform;
this.versions = versions;
if (formattedVersion == null) {
this.formattedVersion = PlatformDependency.formatVersions(this.versions);
} else {
this.formattedVersion = formattedVersion;
}
}
/**
* Get the platform for this version
* @return platform
*/
@NotNull
@ApiModelProperty(value = "Platform for this version", required = true)
public Platform getPlatform() {
return platform;
}
public void setPlatform(Platform platform) {
this.platform = platform;
}
/**
* Get valid versions for this platform & version
* @return list of versions
*/
@NotNull
@ApiModelProperty(value = "Valid versions", required = true)
public List<String> getVersions() {
return versions;
}
public void setVersions(List<String> versions) {
this.versions = versions;
}
public void addVersion(String version) {
if (!this.versions.contains(version)) {
this.versions.add(version);
}
}
@NotNull
@ApiModelProperty(value = "Formatted version string")
public String getFormattedVersion() {
return formattedVersion;
}
private static String formatVersions(List<String> versions) {
return StringUtils.formatVersionNumbers(versions);
}
@Override
public String toString() {
return "PlatformDependency{" +
"platform=" + platform +
", versions=" + versions +
", formattedVersion='" + formattedVersion + '\'' +
'}';
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PlatformDependency that = (PlatformDependency) o;
return platform == that.platform &&
versions.equals(that.versions) &&
formattedVersion.equals(that.formattedVersion);
}
@Override
public int hashCode() {
return Objects.hash(platform, versions, formattedVersion);
}
}

11
src/main/java/io/papermc/hangar/model/generated/Project.java
View File

@ -19,6 +19,9 @@ import java.util.StringJoiner;
*/
@Validated
public class Project {
@JsonProperty("id")
private long id;
@JsonProperty("created_at")
private OffsetDateTime createdAt = null;
@ -72,6 +75,14 @@ public class Project {
@JsonIgnore
private Long watchers;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public OffsetDateTime getCreatedAt() {
return createdAt;
}

17
src/main/java/io/papermc/hangar/model/generated/Version.java
View File

@ -2,13 +2,17 @@ package io.papermc.hangar.model.generated;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.papermc.hangar.model.Platform;
import org.jdbi.v3.core.enums.EnumByOrdinal;
import org.jdbi.v3.core.mapper.Nested;
import org.springframework.validation.annotation.Validated;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@ -29,7 +33,7 @@ public class Version {
@JsonProperty("dependencies")
@Valid
private List<Dependency> dependencies = new ArrayList<>();
private Map<Platform, List<Dependency>> dependencies = new EnumMap<>(Platform.class);
@JsonProperty("visibility")
private Visibility visibility = null;
@ -99,16 +103,11 @@ public class Version {
this.name = name;
}
public Version dependencies(List<Dependency> dependencies) {
public Version dependencies(Map<Platform, List<Dependency>> dependencies) {
this.dependencies = dependencies;
return this;
}
public Version addDependenciesItem(Dependency dependenciesItem) {
this.dependencies.add(dependenciesItem);
return this;
}
/**
* Get dependencies
*
@ -117,11 +116,11 @@ public class Version {
@ApiModelProperty(required = true, value = "")
@NotNull
@Valid
public List<Dependency> getDependencies() {
public Map<Platform, List<Dependency>> getDependencies() {
return dependencies;
}
public void setDependencies(List<Dependency> dependencies) {
public void setDependencies(Map<Platform, List<Dependency>> dependencies) {
this.dependencies = dependencies;
}

23
src/main/java/io/papermc/hangar/model/viewhelpers/VersionData.java
View File

@ -2,14 +2,12 @@ package io.papermc.hangar.model.viewhelpers;
import io.papermc.hangar.db.model.ProjectChannelsTable;
import io.papermc.hangar.db.model.ProjectVersionsTable;
import io.papermc.hangar.db.model.ProjectsTable;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
public class VersionData {
@ -17,9 +15,9 @@ public class VersionData {
private final ProjectVersionsTable v;
private final ProjectChannelsTable c;
private final String approvedBy;
private final Map<Dependency, ProjectsTable> dependencies;
private final Map<Platform, Map<Dependency, String>> dependencies;
public VersionData(ProjectData p, ProjectVersionsTable v, ProjectChannelsTable c, String approvedBy, Map<Dependency, ProjectsTable> dependencies) {
public VersionData(ProjectData p, ProjectVersionsTable v, ProjectChannelsTable c, String approvedBy, Map<Platform, Map<Dependency, String>> dependencies) {
this.p = p;
this.v = v;
this.c = c;
@ -43,19 +41,12 @@ public class VersionData {
return approvedBy;
}
public Set<Dependency> getDependencies() {
return dependencies.keySet();
public Map<Platform, Map<Dependency, String>> getDependencies() {
return dependencies;
}
public Map<Dependency, ProjectsTable> getFilteredDependencies() {
// Value is nullable, so we can't use Collectors#toMap
Map<Dependency, ProjectsTable> map = new HashMap<>();
for (Entry<Dependency, ProjectsTable> entry : dependencies.entrySet()) {
if (Platform.getByDependencyId(entry.getKey().getPluginId()) == null) { // Exclude the platform dependency
map.put(entry.getKey(), entry.getValue());
}
}
return map;
public Map<PlatformDependency, Map<Dependency, String>> getFormattedDependencies() {
return this.v.getPlatforms().stream().collect(HashMap::new, (hashMap, platformDependency) -> hashMap.put(platformDependency, this.dependencies.get(platformDependency.getPlatform())), HashMap::putAll);
}
public boolean isRecommended() {

19
src/main/java/io/papermc/hangar/model/viewhelpers/VersionDependencies.java Normal file
View File

@ -0,0 +1,19 @@
package io.papermc.hangar.model.viewhelpers;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
public class VersionDependencies extends EnumMap<Platform, List<Dependency>> {
public VersionDependencies() {
super(Platform.class);
}
public VersionDependencies(Map<Platform, ? extends List<Dependency>> m) {
super(m);
}
}

10
src/main/java/io/papermc/hangar/model/viewhelpers/ViewTag.java
View File

@ -1,15 +1,17 @@
package io.papermc.hangar.model.viewhelpers;
import io.papermc.hangar.model.TagColor;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import io.papermc.hangar.model.TagColor;
import java.util.List;
public class ViewTag {
private final String name;
private final String data;
private final List<String> data;
private final TagColor color;
public ViewTag(String name, String data, TagColor color) {
public ViewTag(String name, List<String> data, TagColor color) {
this.name = name;
this.data = data;
this.color = color;
@ -19,7 +21,7 @@ public class ViewTag {
return name;
}
public String getData() {
public List<String> getData() {
return data;
}

12
src/main/java/io/papermc/hangar/service/MarkdownService.java
View File

@ -1,6 +1,5 @@
package io.papermc.hangar.service;
import com.vladsch.flexmark.ast.MailLink;
import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
@ -9,20 +8,10 @@ import com.vladsch.flexmark.ext.tables.TablesExtension;
import com.vladsch.flexmark.ext.typographic.TypographicExtension;
import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.html.LinkResolver;
import com.vladsch.flexmark.html.renderer.LinkResolverBasicContext;
import com.vladsch.flexmark.html.renderer.LinkStatus;
import com.vladsch.flexmark.html.renderer.LinkType;
import com.vladsch.flexmark.html.renderer.ResolvedLink;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.ast.Node;
import com.vladsch.flexmark.util.data.MutableDataSet;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@Service
@ -59,6 +48,7 @@ public class MarkdownService {
}
public String render(String input) {
if (input == null) return "";
return this.render(input, RenderSettings.defaultSettings);
}

36
src/main/java/io/papermc/hangar/service/VersionService.java
View File

@ -12,6 +12,7 @@ import io.papermc.hangar.db.model.ProjectsTable;
import io.papermc.hangar.db.model.UsersTable;
import io.papermc.hangar.exceptions.HangarException;
import io.papermc.hangar.model.Permission;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.TagColor;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
@ -32,9 +33,11 @@ import org.springframework.web.context.annotation.RequestScope;
import org.springframework.web.server.ResponseStatusException;
import javax.servlet.http.HttpServletRequest;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
@ -85,6 +88,15 @@ public class VersionService extends HangarService {
return () -> this.getVersionData(projectService.projectData().get(), projectVersionsTable().get());
}
public ProjectVersionsTable getMostRelevantVersion(ProjectsTable project) {
Optional<ProjectVersionsTable> version = Optional.ofNullable(getRecommendedVersion(project));
return version.or(() -> Optional.ofNullable(getMostRecentVersion(project))).orElse(null);
}
public ProjectVersionsTable getMostRecentVersion(ProjectsTable project) {
return versionDao.get().getMostRecentVersion(project.getId());
}
public ProjectVersionsTable getRecommendedVersion(ProjectsTable project) {
if (project.getRecommendedVersionId() == null) {
return null;
@ -164,17 +176,29 @@ public class VersionService extends HangarService {
}
}
//TODO dependency identification
/*Map<Dependency, ProjectsTable> dependencies = Dependency.from(projectVersion.getDependencies()).stream().collect(HashMap::new, (m, v) -> {
ProjectsTable project = projectDao.get().getByPluginId(v.getPluginId());
m.put(v, project);
}, HashMap::putAll);*/
Map<Platform, Map<Dependency, String>> dependencies = new EnumMap<>(Platform.class);
projectVersion.getDependencies().forEach((platform, deps) -> dependencies.put(
platform,
deps.stream().collect(
HashMap::new,
(m, d) -> {
if (d.getExternalUrl() != null) {
m.put(d, d.getExternalUrl());
} else if (d.getProjectId() != null) {
ProjectsTable projectsTable = projectService.getProjectsTable(d.getProjectId());
m.put(d, "/" + projectsTable.getOwnerName() + "/" + projectsTable.getSlug());
} else {
m.put(d, null);
}},
HashMap::putAll
)
));
return new VersionData(
projectData,
projectVersion,
projectChannel,
approvedBy,
Map.of() //TODO
dependencies
);
}

11
src/main/java/io/papermc/hangar/service/api/V1ApiService.java
View File

@ -14,7 +14,6 @@ import io.papermc.hangar.db.model.UserProjectRolesTable;
import io.papermc.hangar.db.model.UsersTable;
import io.papermc.hangar.model.Role;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.ProjectSortingStrategy;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -167,15 +166,7 @@ public class V1ApiService {
.put("downloads", 0)
.put("description", v.getDescription());
objectNode.set("channel", mapper.valueToTree(channel));
objectNode.set("dependencies", Dependency.from(v.getDependencies()).stream().collect(Collector.of(mapper::createArrayNode, (array, dep) -> {
ObjectNode depObj = mapper.createObjectNode()
//TODO dependency identification
.put("pluginId", dep.getPluginId())
.put("version", dep.getVersion());
array.add(depObj);
}, (ignored1, ignored2) -> {
throw new UnsupportedOperationException();
})));
objectNode.set("dependencies", mapper.valueToTree(v.getDependencies()));
if (v.getVisibility() != Visibility.PUBLIC) {
ObjectNode visObj = mapper.createObjectNode()

24
src/main/java/io/papermc/hangar/service/plugindata/DataValue.java
View File

@ -1,9 +1,15 @@
package io.papermc.hangar.service.plugindata;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
public abstract class DataValue {
@ -47,28 +53,28 @@ public abstract class DataValue {
public static class DependencyDataValue extends DataValue {
private final List<Dependency> value;
private final VersionDependencies value;
public DependencyDataValue(String key, List<Dependency> value) {
public DependencyDataValue(String key, Platform platform, List<Dependency> dependencies) {
super(key);
this.value = value;
this.value = new VersionDependencies(Map.of(platform, dependencies));
}
public List<Dependency> getValue() {
public VersionDependencies getValue() {
return value;
}
}
public static class UUIDDataValue extends DataValue {
public static class PlatformDependencyDataValue extends DataValue {
private final UUID value;
private final List<PlatformDependency> value;
public UUIDDataValue(String key, UUID value) {
public PlatformDependencyDataValue(String key, PlatformDependency value) {
super(key);
this.value = value;
this.value = new ArrayList<>(List.of(value));
}
public UUID getValue() {
public List<PlatformDependency> getValue() {
return value;
}
}

25
src/main/java/io/papermc/hangar/service/plugindata/PluginDataService.java
View File

@ -11,19 +11,16 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import static io.papermc.hangar.service.plugindata.DataValue.UUIDDataValue;
@Service
public class PluginDataService {
@ -39,25 +36,27 @@ public class PluginDataService {
public PluginFileWithData loadMeta(Path file, long userId) throws IOException {
try (JarInputStream jarInputStream = openJar(file)) {
List<DataValue> dataValues = new ArrayList<>();
Map<Platform, List<DataValue>> dataValueMap = new EnumMap<>(Platform.class);
JarEntry jarEntry;
Platform platform = null;
while ((jarEntry = jarInputStream.getNextJarEntry()) != null) {
FileTypeHandler fileTypeHandler = fileTypeHandlers.get(jarEntry.getName());
if (fileTypeHandler != null) {
BufferedReader reader = new BufferedReader(new InputStreamReader(jarInputStream));
List<DataValue> data = fileTypeHandler.getData(reader);
dataValues.addAll(data);
platform = fileTypeHandler.getPlatform();
dataValueMap.put(fileTypeHandler.getPlatform(), fileTypeHandler.getData(reader));
}
}
if (dataValues.isEmpty() || dataValues.size() == 1 || platform == null) { // 1 = only dep was found = useless
if (dataValueMap.isEmpty() ) {
throw new HangarException("error.plugin.metaNotFound");
} else {
dataValues.add(new UUIDDataValue("id", UUID.randomUUID()));
PluginFileWithData fileData = new PluginFileWithData(file, new PluginFileData(dataValues), userId, platform);
}
else {
dataValueMap.forEach((platform, dataValues) -> {
if (dataValues.size() == 1) { // 1 = only dep was found = useless
throw new HangarException("error.plugin.metaNotFound");
}
});
PluginFileWithData fileData = new PluginFileWithData(file, new PluginFileData(dataValueMap), userId);
if (!fileData.getData().validate()) {
throw new HangarException("error.plugin.incomplete", "id or version");
}

62
src/main/java/io/papermc/hangar/service/plugindata/PluginFileData.java
View File

@ -1,32 +1,52 @@
package io.papermc.hangar.service.plugindata;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import io.papermc.hangar.service.VersionService;
import io.papermc.hangar.service.plugindata.handler.FileTypeHandler;
import org.springframework.lang.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import io.papermc.hangar.model.generated.Dependency;
import static io.papermc.hangar.service.plugindata.DataValue.*;
import static io.papermc.hangar.service.plugindata.DataValue.DependencyDataValue;
import static io.papermc.hangar.service.plugindata.DataValue.PlatformDependencyDataValue;
import static io.papermc.hangar.service.plugindata.DataValue.StringDataValue;
import static io.papermc.hangar.service.plugindata.DataValue.StringListDataValue;
public class PluginFileData {
private final Map<String, DataValue> dataValues = new HashMap<>();
public PluginFileData(List<DataValue> dataValues) {
for (DataValue dataValue : dataValues) {
this.dataValues.put(dataValue.getKey(), dataValue);
}
}
@Nullable
public UUID getId() {
DataValue id = dataValues.get("id");
return id != null ? ((UUIDDataValue) id).getValue() : null;
public PluginFileData(Map<Platform, List<DataValue>> dataValues) {
dataValues.forEach((platform, values) -> {
for (DataValue value : values) {
switch (value.getKey()) {
case FileTypeHandler.DEPENDENCIES:
if (this.dataValues.containsKey(value.getKey())) {
DependencyDataValue dependencyDataValue = (DependencyDataValue) this.dataValues.get(value.getKey());
dependencyDataValue.getValue().putAll(((DependencyDataValue) value).getValue());
} else {
this.dataValues.put(value.getKey(), value);
}
break;
case FileTypeHandler.PLATFORM_DEPENDENCY:
if (this.dataValues.containsKey(value.getKey())) {
PlatformDependencyDataValue platformDependencyDataValue = (PlatformDependencyDataValue) this.dataValues.get(value.getKey());
platformDependencyDataValue.getValue().addAll(((PlatformDependencyDataValue) value).getValue());
} else {
this.dataValues.put(value.getKey(), value);
}
break;
default:
this.dataValues.put(value.getKey(), value);
}
}
});
}
@Nullable
@ -60,13 +80,21 @@ public class PluginFileData {
}
@Nullable
public List<Dependency> getDependencies() {
public VersionDependencies getDependencies() {
DataValue dependencies = dataValues.get("dependencies");
return dependencies != null ? ((DependencyDataValue) dependencies).getValue() : null;
if (dependencies == null) {
return new VersionDependencies(getPlatformDependency().stream().collect(Collectors.toMap(PlatformDependency::getPlatform, pd -> new ArrayList<>())));
}
return ((DependencyDataValue) dependencies).getValue();
}
public List<PlatformDependency> getPlatformDependency() {
DataValue platformDependencies = dataValues.get(FileTypeHandler.PLATFORM_DEPENDENCY);
return platformDependencies != null ? ((PlatformDependencyDataValue) platformDependencies).getValue() : null;
}
public boolean validate() {
return getId() != null && getName() != null && getAuthors() != null && getDependencies() != null;
return getName() != null && getAuthors() != null && getPlatformDependency() != null;
}
public List<ProjectVersionTagsTable> createTags(long versionId, VersionService versionService) {

9
src/main/java/io/papermc/hangar/service/plugindata/PluginFileWithData.java
View File

@ -1,6 +1,5 @@
package io.papermc.hangar.service.plugindata;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.util.CryptoUtils;
import java.io.IOException;
@ -11,13 +10,11 @@ public class PluginFileWithData {
private final Path path;
private final PluginFileData data;
private final long userId;
private final Platform platform;
public PluginFileWithData(Path path, PluginFileData data, long userId, Platform platform) {
public PluginFileWithData(Path path, PluginFileData data, long userId) {
this.path = path;
this.data = data;
this.userId = userId;
this.platform = platform;
}
public Path getPath() {
@ -32,10 +29,6 @@ public class PluginFileWithData {
return userId;
}
public Platform getPlatform() {
return platform;
}
public String getMd5() {
try {
return CryptoUtils.md5ToHex(Files.readAllBytes(this.path));

8
src/main/java/io/papermc/hangar/service/plugindata/handler/FileTypeHandler.java
View File

@ -8,6 +8,14 @@ import java.util.List;
public abstract class FileTypeHandler {
public static final String VERSION = "version";
public static final String NAME = "name";
public static final String DESCRIPTION = "description";
public static final String URL = "url";
public static final String AUTHORS = "authors";
public static final String DEPENDENCIES = "dependencies";
public static final String PLATFORM_DEPENDENCY = "platform-dependency";
private final String fileName;
protected FileTypeHandler(String fileName) {

39
src/main/java/io/papermc/hangar/service/plugindata/handler/PaperPluginFileHandler.java
View File

@ -2,6 +2,7 @@ package io.papermc.hangar.service.plugindata.handler;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.service.plugindata.DataValue;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
@ -29,48 +30,58 @@ public class PaperPluginFileHandler extends FileTypeHandler {
return result;
}
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue("version", version));
if (data.containsKey("version")) {
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue(FileTypeHandler.VERSION, version));
}
}
String name = (String) data.get("name");
if (name != null) {
result.add(new DataValue.StringDataValue("name", name));
result.add(new DataValue.StringDataValue(FileTypeHandler.NAME, name));
}
String description = (String) data.get("description");
if (description != null) {
result.add(new DataValue.StringDataValue("description", description));
result.add(new DataValue.StringDataValue(FileTypeHandler.DESCRIPTION, description));
}
String website = (String) data.get("website");
if (website != null) {
result.add(new DataValue.StringDataValue("url", website));
result.add(new DataValue.StringDataValue(FileTypeHandler.URL, website));
}
String author = (String) data.get("author");
if (author != null) {
result.add(new DataValue.StringListDataValue("authors", List.of(author)));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, List.of(author)));
}
//noinspection unchecked
List<String> authors = (List<String>) data.get("authors");
if (authors != null) {
result.add(new DataValue.StringListDataValue("authors", authors));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, authors));
}
List<Dependency> dependencies = new ArrayList<>();
//noinspection unchecked
List<String> softdepend = (List<String>) data.get("softdepend");
if (softdepend != null) {
dependencies.addAll(softdepend.stream().map(p -> new Dependency(p, null, false)).collect(Collectors.toList()));
dependencies.addAll(softdepend.stream().map(depName -> new Dependency(depName, false)).collect(Collectors.toList()));
}
//noinspection unchecked
List<String> depend = (List<String>) data.get("depend");
if (depend != null) {
dependencies.addAll(depend.stream().map(p -> new Dependency(p, null)).collect(Collectors.toList()));
dependencies.addAll(depend.stream().map(depName -> new Dependency(depName, true)).collect(Collectors.toList()));
}
String paperVersion = data.getOrDefault("api-version", "").toString();
Dependency paperDependency = new Dependency("paperapi", !paperVersion.isEmpty() ? paperVersion : null);
dependencies.add(paperDependency);
result.add(new DataValue.DependencyDataValue("dependencies", dependencies));
if (!dependencies.isEmpty()) {
result.add(new DataValue.DependencyDataValue(FileTypeHandler.DEPENDENCIES, getPlatform(), dependencies));
}
// System.out.println(dependencies);
List<String> versions = new ArrayList<>();
if (data.containsKey("api-version")) {
versions.add(data.get("api-version").toString());
}
result.add(new DataValue.PlatformDependencyDataValue(FileTypeHandler.PLATFORM_DEPENDENCY, new PlatformDependency(getPlatform(), versions)));
return result;
}

28
src/main/java/io/papermc/hangar/service/plugindata/handler/VelocityFileHandler.java
View File

@ -2,6 +2,7 @@ package io.papermc.hangar.service.plugindata.handler;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.service.plugindata.DataValue;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
@ -29,42 +30,47 @@ public class VelocityFileHandler extends FileTypeHandler {
return result;
}
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue("version", version));
if (data.containsKey("version")) {
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue(FileTypeHandler.VERSION, version));
}
}
String name = (String) data.get("name");
if (name != null) {
result.add(new DataValue.StringDataValue("name", name));
result.add(new DataValue.StringDataValue(FileTypeHandler.NAME, name));
}
String description = (String) data.get("description");
if (description != null) {
result.add(new DataValue.StringDataValue("description", description));
result.add(new DataValue.StringDataValue(FileTypeHandler.DESCRIPTION, description));
}
String url = (String) data.get("url");
if (url != null) {
result.add(new DataValue.StringDataValue("url", url));
result.add(new DataValue.StringDataValue(FileTypeHandler.URL, url));
}
String author = (String) data.get("author");
if (author != null) {
result.add(new DataValue.StringListDataValue("authors", List.of(author)));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, List.of(author)));
}
//noinspection unchecked
List<String> authors = (List<String>) data.get("authors");
if (authors != null) {
result.add(new DataValue.StringListDataValue("authors", authors));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, authors));
}
List<Dependency> dependencies;
//noinspection unchecked
List<Map<String, Object>> deps = (List<Map<String, Object>>) data.get("dependencies");
if (deps != null) {
dependencies = deps.stream().map(p -> new Dependency((String) p.get("id"), null, !(boolean) p.getOrDefault("optional", false))).collect(Collectors.toList());
dependencies = deps.stream().map(dep -> new Dependency((String) dep.get("id"), !(boolean) dep.getOrDefault("optional", false))).collect(Collectors.toList());
} else {
dependencies = new ArrayList<>();
}
dependencies.add(new Dependency(Platform.VELOCITY.getDependencyId(), null));
result.add(new DataValue.DependencyDataValue("dependencies", dependencies));
if (!dependencies.isEmpty()) {
result.add(new DataValue.DependencyDataValue(FileTypeHandler.DEPENDENCIES, getPlatform(), dependencies));
}
result.add(new DataValue.PlatformDependencyDataValue(FileTypeHandler.PLATFORM_DEPENDENCY, new PlatformDependency(getPlatform(), new ArrayList<>())));
return result;
}

34
src/main/java/io/papermc/hangar/service/plugindata/handler/WaterfallPluginFileHandler.java
View File

@ -2,6 +2,7 @@ package io.papermc.hangar.service.plugindata.handler;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.service.plugindata.DataValue;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
@ -29,47 +30,52 @@ public class WaterfallPluginFileHandler extends FileTypeHandler {
return result;
}
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue("version", version));
if (data.containsKey("version")) {
String version = String.valueOf(data.get("version"));
if (version != null) {
result.add(new DataValue.StringDataValue(FileTypeHandler.VERSION, version));
}
}
String name = (String) data.get("name");
if (name != null) {
result.add(new DataValue.StringDataValue("name", name));
result.add(new DataValue.StringDataValue(FileTypeHandler.NAME, name));
}
String description = (String) data.get("description");
if (description != null) {
result.add(new DataValue.StringDataValue("description", description));
result.add(new DataValue.StringDataValue(FileTypeHandler.DESCRIPTION, description));
}
String website = (String) data.get("website");
if (website != null) {
result.add(new DataValue.StringDataValue("url", website));
result.add(new DataValue.StringDataValue(FileTypeHandler.URL, website));
}
String author = (String) data.get("author");
if (author != null) {
result.add(new DataValue.StringListDataValue("authors", List.of(author)));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, List.of(author)));
}
//noinspection unchecked
List<String> authors = (List<String>) data.get("authors");
if (authors != null) {
result.add(new DataValue.StringListDataValue("authors", authors));
result.add(new DataValue.StringListDataValue(FileTypeHandler.AUTHORS, authors));
}
List<Dependency> dependencies = new ArrayList<>();
//noinspection unchecked
List<String> softdepend = (List<String>) data.get("softdepend");
List<String> softdepend = (List<String>) data.get("softDepends");
if (softdepend != null) {
dependencies.addAll(softdepend.stream().map(p -> new Dependency(p, null, false)).collect(Collectors.toList()));
dependencies.addAll(softdepend.stream().map(depName -> new Dependency(depName, false)).collect(Collectors.toList()));
}
//noinspection unchecked
List<String> depend = (List<String>) data.get("depend");
List<String> depend = (List<String>) data.get("depends");
if (depend != null) {
dependencies.addAll(depend.stream().map(p -> new Dependency(p, null)).collect(Collectors.toList()));
dependencies.addAll(depend.stream().map(depName -> new Dependency(depName, true)).collect(Collectors.toList()));
}
dependencies.add(new Dependency(Platform.WATERFALL.getDependencyId(), null));
result.add(new DataValue.DependencyDataValue("dependencies", dependencies));
if (!dependencies.isEmpty()) {
result.add(new DataValue.DependencyDataValue(FileTypeHandler.DEPENDENCIES, getPlatform(), dependencies));
}
result.add(new DataValue.PlatformDependencyDataValue(FileTypeHandler.PLATFORM_DEPENDENCY, new PlatformDependency(getPlatform(), new ArrayList<>())));
return result;
}

89
src/main/java/io/papermc/hangar/service/pluginupload/PendingVersion.java
View File

@ -1,23 +1,25 @@
package io.papermc.hangar.service.pluginupload;
import io.papermc.hangar.db.model.ProjectVersionTagsTable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.papermc.hangar.controller.forms.NewVersion;
import io.papermc.hangar.db.model.ProjectVersionsTable;
import io.papermc.hangar.model.Color;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.generated.PlatformDependency;
import io.papermc.hangar.model.viewhelpers.ProjectData;
import io.papermc.hangar.model.viewhelpers.VersionDependencies;
import io.papermc.hangar.service.plugindata.PluginFileWithData;
import io.papermc.hangar.service.project.ProjectFactory;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Optional;
public class PendingVersion {
private final String versionString;
private final List<Dependency> dependencies;
private final VersionDependencies dependencies;
private final List<PlatformDependency> platforms;
private final String description;
private final long projectId;
private final Long fileSize;
@ -29,10 +31,12 @@ public class PendingVersion {
private final PluginFileWithData plugin;
private final String externalUrl;
private final boolean createForumPost;
private final ProjectVersionsTable prevVersion;
public PendingVersion(String versionString, List<Dependency> dependencies, String description, long projectId, Long fileSize, String hash, String fileName, long authorId, String channelName, Color channelColor, PluginFileWithData plugin, String externalUrl, boolean createForumPost) {
public PendingVersion(@Nullable String versionString, @Nullable VersionDependencies dependencies, @Nullable List<PlatformDependency> platforms, @NotNull String description, long projectId, @Nullable Long fileSize, @Nullable String hash, @Nullable String fileName, long authorId, String channelName, Color channelColor, @Nullable PluginFileWithData plugin, @Nullable String externalUrl, boolean createForumPost, @Nullable ProjectVersionsTable prevVersion) {
this.versionString = versionString;
this.dependencies = dependencies;
this.platforms = platforms;
this.description = description;
this.projectId = projectId;
this.fileSize = fileSize;
@ -44,16 +48,25 @@ public class PendingVersion {
this.plugin = plugin;
this.externalUrl = externalUrl;
this.createForumPost = createForumPost;
this.prevVersion = prevVersion;
}
@Nullable
public String getVersionString() {
return versionString;
}
public List<Dependency> getDependencies() {
@Nullable
public VersionDependencies getDependencies() {
return dependencies;
}
@Nullable
public List<PlatformDependency> getPlatforms() {
return platforms;
}
@Nullable
public String getDescription() {
return description;
}
@ -62,14 +75,17 @@ public class PendingVersion {
return projectId;
}
@Nullable
public Long getFileSize() {
return fileSize;
}
@Nullable
public String getHash() {
return hash;
}
@Nullable
public String getFileName() {
return fileName;
}
@ -86,10 +102,12 @@ public class PendingVersion {
return channelColor;
}
@JsonIgnore
public PluginFileWithData getPlugin() {
return plugin;
}
@Nullable
public String getExternalUrl() {
return externalUrl;
}
@ -98,16 +116,16 @@ public class PendingVersion {
return createForumPost;
}
public List<Pair<Platform, ProjectVersionTagsTable>> getDependenciesAsGhostTags() {
return Platform.getGhostTags(-1L, dependencies);
@Nullable
public ProjectVersionsTable getPrevVersion() {
return prevVersion;
}
public PendingVersion copy(String channelName, Color channelColor, boolean createForumPost, String description, List<String> versions, Platform platform) {
Optional<Dependency> optional = dependencies.stream().filter(d -> d.getPluginId().equals(platform.getDependencyId())).findAny();
optional.ifPresent(dependency -> dependency.setVersion(String.join(",", versions))); // Should always be present, if not, there are other problems
public PendingVersion copy(String channelName, Color channelColor, boolean createForumPost, String description, List<PlatformDependency> platformDependencies) {
return new PendingVersion(
versionString,
dependencies,
platformDependencies,
description,
projectId,
fileSize,
@ -117,11 +135,52 @@ public class PendingVersion {
channelName,
channelColor,
plugin,
externalUrl, createForumPost
);
externalUrl,
createForumPost,
prevVersion);
}
public PendingVersion update(NewVersion newVersion) {
return new PendingVersion(
versionString,
newVersion.getVersionDependencies(),
newVersion.getPlatformDependencies(),
newVersion.getContent(),
projectId,
fileSize,
hash,
fileName,
authorId,
newVersion.getChannel().getName(),
newVersion.getChannel().getColor(),
plugin,
newVersion.getExternalUrl(),
newVersion.isForumSync(),
prevVersion);
}
public ProjectVersionsTable complete(HttpServletRequest request, ProjectData project, ProjectFactory factory) {
return factory.createVersion(request, project, this);
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("PendingVersion{");
sb.append("versionString='").append(versionString).append('\'');
sb.append(", dependencies=").append(dependencies);
sb.append(", platforms=").append(platforms);
sb.append(", description='").append(description).append('\'');
sb.append(", projectId=").append(projectId);
sb.append(", fileSize=").append(fileSize);
sb.append(", hash='").append(hash).append('\'');
sb.append(", fileName='").append(fileName).append('\'');
sb.append(", authorId=").append(authorId);
sb.append(", channelName='").append(channelName).append('\'');
sb.append(", channelColor=").append(channelColor);
sb.append(", plugin=").append(plugin);
sb.append(", externalUrl='").append(externalUrl).append('\'');
sb.append(", createForumPost=").append(createForumPost);
sb.append('}');
return sb.toString();
}
}

11
src/main/java/io/papermc/hangar/service/pluginupload/PluginUploadService.java
View File

@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.function.Supplier;
@Service
public class PluginUploadService {
@ -36,8 +37,10 @@ public class PluginUploadService {
private final CacheManager cacheManager;
private final HangarConfig config;
private final Supplier<ProjectsTable> projectsTable;
@Autowired
public PluginUploadService(HangarConfig hangarConfig, ProjectFiles projectFiles, PluginDataService pluginDataService, ChannelService channelService, VersionService versionService, CacheManager cacheManager, HangarConfig config) {
public PluginUploadService(HangarConfig hangarConfig, ProjectFiles projectFiles, PluginDataService pluginDataService, ChannelService channelService, VersionService versionService, CacheManager cacheManager, HangarConfig config, Supplier<ProjectsTable> projectsTable) {
this.hangarConfig = hangarConfig;
this.projectFiles = projectFiles;
this.pluginDataService = pluginDataService;
@ -45,6 +48,7 @@ public class PluginUploadService {
this.versionService = versionService;
this.cacheManager = cacheManager;
this.config = config;
this.projectsTable = projectsTable;
}
public PluginFileWithData processPluginUpload(MultipartFile file, UsersTable owner) {
@ -110,6 +114,7 @@ public class PluginUploadService {
return new PendingVersion(
StringUtils.slugify(metaData.getVersion()),
metaData.getDependencies(),
metaData.getPlatformDependency(),
metaData.getDescription(),
projectId,
path.toFile().length(),
@ -120,7 +125,7 @@ public class PluginUploadService {
config.getChannels().getColorDefault(),
plugin,
null,
forumSync
);
forumSync,
versionService.getMostRelevantVersion(projectsTable.get()));
}
}

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

@ -1,6 +1,8 @@
package io.papermc.hangar.service.project;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.papermc.hangar.config.hangar.HangarConfig;
import io.papermc.hangar.db.customtypes.JSONB;
import io.papermc.hangar.db.customtypes.LoggedActionType;
import io.papermc.hangar.db.customtypes.LoggedActionType.ProjectContext;
import io.papermc.hangar.db.dao.HangarDao;
@ -20,7 +22,6 @@ import io.papermc.hangar.model.NotificationType;
import io.papermc.hangar.model.Platform;
import io.papermc.hangar.model.Role;
import io.papermc.hangar.model.Visibility;
import io.papermc.hangar.model.generated.Dependency;
import io.papermc.hangar.model.viewhelpers.ProjectData;
import io.papermc.hangar.model.viewhelpers.ProjectPage;
import io.papermc.hangar.model.viewhelpers.VersionData;
@ -43,7 +44,6 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Component
public class ProjectFactory {
@ -60,9 +60,10 @@ public class ProjectFactory {
private final NotificationService notificationService;
private final UserActionLogService userActionLogService;
private final ProjectFiles projectFiles;
private final ObjectMapper mapper;
@Autowired
public ProjectFactory(HangarConfig hangarConfig, HangarDao<ProjectChannelDao> projectChannelDao, HangarDao<ProjectDao> projectDao, HangarDao<ProjectPageDao> projectPagesDao, HangarDao<ProjectVersionDao> projectVersionDao, RoleService roleService, UserService userService, ProjectService projectService, ChannelService channelService, VersionService versionService, NotificationService notificationService, UserActionLogService userActionLogService, ProjectFiles projectFiles) {
public ProjectFactory(HangarConfig hangarConfig, HangarDao<ProjectChannelDao> projectChannelDao, HangarDao<ProjectDao> projectDao, HangarDao<ProjectPageDao> projectPagesDao, HangarDao<ProjectVersionDao> projectVersionDao, RoleService roleService, UserService userService, ProjectService projectService, ChannelService channelService, VersionService versionService, NotificationService notificationService, UserActionLogService userActionLogService, ProjectFiles projectFiles, ObjectMapper mapper) {
this.hangarConfig = hangarConfig;
this.projectChannelDao = projectChannelDao;
this.projectDao = projectDao;
@ -75,6 +76,7 @@ public class ProjectFactory {
this.notificationService = notificationService;
this.userActionLogService = userActionLogService;
this.projectFiles = projectFiles;
this.mapper = mapper;
}
public String getUploadError(UsersTable user) {
@ -144,14 +146,7 @@ public class ProjectFactory {
ProjectVersionsTable version = projectVersionDao.get().insert(new ProjectVersionsTable(
pendingVersion.getVersionString(),
//TODO dependency identification
pendingVersion.getDependencies().stream().map(d -> {
if (d.getVersion() == null || d.getVersion().isBlank()) {
return d.getPluginId();
} else {
return d.getPluginId() + ":" + d.getVersion();
}
}).collect(Collectors.toList()),
pendingVersion.getDependencies(),
pendingVersion.getDescription(),
pendingVersion.getProjectId(),
channel.getId(),
@ -160,14 +155,15 @@ public class ProjectFactory {
pendingVersion.getFileName(),
pendingVersion.getAuthorId(),
pendingVersion.isCreateForumPost(),
pendingVersion.getExternalUrl()
));
pendingVersion.getExternalUrl(),
pendingVersion.getPlatforms()
), new JSONB(mapper.valueToTree(pendingVersion.getDependencies())), new JSONB(mapper.valueToTree(pendingVersion.getPlatforms())));
if (pendingVersion.getPlugin() != null) {
pendingVersion.getPlugin().getData().createTags(version.getId(), versionService); // TODO not sure what this is for
}
Platform.createPlatformTags(versionService, version.getId(), Dependency.from(version.getDependencies()));
Platform.createPlatformTags(versionService, version.getId(), version.getPlatforms());
List<UsersTable> watchers = projectService.getProjectWatchers(project.getProject().getId(), 0, null);
// TODO bulk notif insert

4
src/main/java/io/papermc/hangar/service/project/ProjectService.java
View File

@ -166,6 +166,10 @@ public class ProjectService extends HangarService {
}
}
public ProjectsTable getProjectsTable(long projectId) {
return checkVisibility(projectDao.get().getById(projectId));
}
public ProjectsTable getProjectsTable(String author, String name) {
return checkVisibility(projectDao.get().getBySlug(author, name));
}

11
src/main/java/io/papermc/hangar/util/Routes.java
View File

@ -2,6 +2,7 @@ package io.papermc.hangar.util;
import org.springframework.web.servlet.ModelAndView;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -63,6 +64,7 @@ public enum Routes {
PROJECTS_REMOVE_MEMBER("projects.removeMember", Paths.PROJECTS_REMOVE_MEMBER, of("author", "slug"), of()),
VERSIONS_RESTORE("versions.restore", Paths.VERSIONS_RESTORE, of("author", "slug", "version"), of()),
VERSIONS_DOWNLOAD_RECOMMENDED_JAR("versions.downloadRecommendedJar", Paths.VERSIONS_DOWNLOAD_RECOMMENDED_JAR, of("author", "slug"), of("token")),
VERSIONS_SAVE_NEW_VERSION("versions.saveNewVersion", Paths.VERSIONS_SAVE_NEW_VERSION, of("author", "slug", "version"), of()),
VERSIONS_PUBLISH("versions.publish", Paths.VERSIONS_PUBLISH, of("author", "slug", "version"), of()),
VERSIONS_PUBLISH_URL("versions.publishUrl", Paths.VERSIONS_PUBLISH_URL, of("author", "slug"), of()),
VERSIONS_SET_RECOMMENDED("versions.setRecommended", Paths.VERSIONS_SET_RECOMMENDED, of("author", "slug", "version"), of()),
@ -130,6 +132,7 @@ public enum Routes {
APIV1_REVOKE_KEY("apiv1.revokeKey", Paths.APIV1_REVOKE_KEY, of("author", "slug"), of()),
APIV1_CREATE_KEY("apiv1.createKey", Paths.APIV1_CREATE_KEY, of("author", "slug"), of()),
APIV1_SHOW_PROJECT("apiv1.showProject", Paths.APIV1_SHOW_PROJECT, of("author", "slug"), of()),
APIV1_SHOW_PROJECT_BY_ID("apiv1.showProjectById", Paths.APIV1_SHOW_PROJECT_BY_ID, of("id"), of()),
APIV1_SYNC_SSO("apiv1.syncSso", Paths.APIV1_SYNC_SSO, of(), of()),
APIV1_TAG_COLOR("apiv1.tagColor", Paths.APIV1_TAG_COLOR, of("tagId"), of()),
APIV1_SHOW_STATUS_Z("apiv1.showStatusZ", Paths.APIV1_SHOW_STATUS_Z, of(), of()),
@ -140,10 +143,16 @@ public enum Routes {
APIV1_LIST_PLATFORMS("apiv1.listPlatforms", Paths.APIV1_LIST_PLATFORMS, of(), of());
private static final Map<String, Routes> ROUTES = new HashMap<>();
private static final Map<Routes, String> JS_ROUTES = new EnumMap<>(Routes.class);
public static Map<Routes, String> getJsRoutes() {
return JS_ROUTES;
}
static {
for (Routes route : values()) {
ROUTES.put(route.name, route);
JS_ROUTES.put(route, route.url);
}
}
@ -272,6 +281,7 @@ public enum Routes {
public static final String VERSIONS_RESTORE = "/{author}/{slug}/versions/{version}/restore";
public static final String VERSIONS_DOWNLOAD_RECOMMENDED_JAR = "/{author}/{slug}/versions/recommended/jar";
public static final String VERSIONS_SAVE_NEW_VERSION = "/{author}/{slug}/versions/new/{version}";
public static final String VERSIONS_PUBLISH = "/{author}/{slug}/versions/{version}";
public static final String VERSIONS_PUBLISH_URL = "/{author}/{slug}/versions/publish";
public static final String VERSIONS_SET_RECOMMENDED = "/{author}/{slug}/versions/{version}/recommended";
@ -345,6 +355,7 @@ public enum Routes {
public static final String APIV1_REVOKE_KEY = "/api/v1/projects/{author}/{slug}/keys/revoke";
public static final String APIV1_CREATE_KEY = "/api/v1/projects/{author}/{slug}/keys/new";
public static final String APIV1_SHOW_PROJECT = "/api/v1/projects/{author}/{slug}";
public static final String APIV1_SHOW_PROJECT_BY_ID = "/api/v1/projects/{id}";
public static final String APIV1_SYNC_SSO = "/api/sync_sso";
public static final String APIV1_TAG_COLOR = "/api/v1/tags/{tagId}";
public static final String APIV1_SHOW_STATUS_Z = "/statusz";

96
src/main/java/io/papermc/hangar/util/StringUtils.java
View File

@ -1,7 +1,15 @@
package io.papermc.hangar.util;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public class StringUtils {
private StringUtils() { }
/**
* Returns a URL readable string from the specified string.
*
@ -22,4 +30,92 @@ public class StringUtils {
return str.trim().replaceAll(" +", " ");
}
/**
* Returns a version number split into an ordered list of numbers
* @param str version string to check (e.g. 2.3.1) MUST BE ALL NUMBERS
* @return the list of integers in ltr order
*/
public static List<Integer> splitVersionNumber(String str) {
return Arrays.stream(str.split("\\.")).map(Integer::parseInt).collect(Collectors.toList());
}
private static final Pattern LAST_WHOLE_VERSION = Pattern.compile("((?<=,\\s)|^)[0-9.]{2,}(?=-\\d+$)");
private static final Pattern PREV_HAS_HYPHEN = Pattern.compile("(?<=\\d-)\\d+$");
private static final Pattern PREV_HAS_COMMA_OR_FIRST = Pattern.compile("((?<=,\\s)|^)[0-9.]+$");
/**
* Format a list of version numbers (will do sorting)
* @param versionNumbers version numbers
* @return formatted string
*/
public static String formatVersionNumbers(List<String> versionNumbers) {
versionNumbers.sort((version1, version2) -> {
int vnum1 = 0, vnum2 = 0;
for (int i = 0, j = 0; (i < version1.length() || j < version2.length());) {
while (i < version1.length() && version1.charAt(i) != '.') {
vnum1 = vnum1 * 10 + (version1.charAt(i) - '0');
i++;
}
while(j < version2.length() && version2.charAt(j) != '.') {
vnum2 = vnum2 * 10 + (version2.charAt(j) - '0');
j++;
}
if (vnum1 > vnum2) {
return 1;
}
if (vnum2 > vnum1) {
return -1;
}
vnum1 = vnum2 = 0;
i++;
j++;
}
return 0;
});
return versionNumbers.stream().reduce("", (verString, version) -> {
if (verString.isBlank()) {
return version;
}
List<Integer> versionArr = StringUtils.splitVersionNumber(version);
Matcher hyphen = PREV_HAS_HYPHEN.matcher(verString);
Matcher comma = PREV_HAS_COMMA_OR_FIRST.matcher(verString);
if (hyphen.find()) {
int prevVersion = Integer.parseInt(hyphen.group());
Matcher prevVersionMatcher = LAST_WHOLE_VERSION.matcher(verString);
if (!prevVersionMatcher.find()) {
throw new IllegalArgumentException("Bad version string");
}
List<Integer> previousWholeVersion = StringUtils.splitVersionNumber(prevVersionMatcher.group());
if (previousWholeVersion.size() == versionArr.size()) {
if (versionArr.get(versionArr.size() - 1) - 1 == prevVersion) {
return verString.replaceFirst("-\\d+$", "-" + versionArr.get(versionArr.size() - 1));
} else {
return verString + ", " + version;
}
} else {
// TODO maybe not?
return verString + ", " + version;
}
} else if (comma.find()) {
List<Integer> prevVersion = StringUtils.splitVersionNumber(comma.group());
if (prevVersion.size() == versionArr.size()) {
if (versionArr.get(versionArr.size() - 1) - 1 == prevVersion.get(prevVersion.size() - 1)) {
return verString + "-" + versionArr.get(versionArr.size() - 1);
} else {
return verString + ", " + version;
}
} else {
// TODO maybe not?
return verString + ", " + version;
}
} else {
throw new IllegalArgumentException("bad formatting: " + version);
}
});
}
}

20
src/main/resources/db/migration/V1.0.0__init.sql
View File

@ -173,7 +173,8 @@ create table project_versions
primary key,
created_at timestamp with time zone not null,
version_string varchar(255) not null,
dependencies varchar(255) [] not null,
dependencies jsonb DEFAULT '{}'::jsonb NOT NULL,
platforms jsonb DEFAULT '[]'::jsonb NOT NULL,
description text,
project_id bigint not null
constraint versions_project_id_fkey
@ -560,7 +561,7 @@ create table project_version_tags
references project_versions
on delete cascade,
name varchar(255) not null,
data varchar(255),
data varchar(255)[],
color integer not null
);
@ -899,18 +900,9 @@ WITH tags AS (
pvti.name,
pvti.data,
CASE
WHEN pvti.name::text = 'Sponge'::text THEN "substring"(pvti.data::text,
'^\[?(\d+)\.\d+(?:\.\d+)?(?:-SNAPSHOT)?(?:-[a-z0-9]{7,9})?(?:,(?:\d+\.\d+(?:\.\d+)?)?\))?$'::text)
WHEN pvti.name::text = 'SpongeForge'::text THEN "substring"(pvti.data::text,
'^\d+\.\d+\.\d+-\d+-(\d+)\.\d+\.\d+(?:(?:-BETA-\d+)|(?:-RC\d+))?$'::text)
WHEN pvti.name::text = 'SpongeVanilla'::text THEN "substring"(pvti.data::text,
'^\d+\.\d+\.\d+-(\d+)\.\d+\.\d+(?:(?:-BETA-\d+)|(?:-RC\d+))?$'::text)
WHEN pvti.name::text = 'Forge'::text
THEN "substring"(pvti.data::text, '^\d+\.(\d+)\.\d+(?:\.\d+)?$'::text)
WHEN pvti.name::text = 'Lantern'::text THEN NULL::text
WHEN pvti.name::text = 'Paper'::text THEN pvti.data::text
WHEN pvti.name::text = 'Waterfall'::text THEN pvti.data::text
WHEN pvti.name::text = 'Velocity'::text THEN pvti.data::text
WHEN pvti.name::text = 'Paper'::text THEN array_to_string(pvti.data, ', ')
WHEN pvti.name::text = 'Waterfall'::text THEN array_to_string(pvti.data, ', ')
WHEN pvti.name::text = 'Velocity'::text THEN array_to_string(pvti.data, ', ')
ELSE NULL::text
END AS platform_version,
pvti.color

11
src/main/resources/templates/layout/base.ftlh
View File

@ -92,10 +92,21 @@ showFooter: Boolean = true, noContainer: Boolean = false, additionalMeta: Html =
</#if>
<#if scriptsEnabled>
<script>
window.ROUTES = ${mapper.valueToTree(Routes.getJsRoutes())}
window.ROUTES.parse = function (key, ...params) {
var route = window.ROUTES[key];
for (let param of params) {
route = route.replace(/{.+?}/, param);
}
return route;
};
</script>
<#if _csrf?? && _csrf.token??>
<script>
window.csrf = '${_csrf.token}';
window.csrfInfo = {
'parameterName': '${_csrf.parameterName}',
'headerName': '${_csrf.headerName}',
'token': '${_csrf.token}'
};

2
src/main/resources/templates/projects/tag.ftlh
View File

@ -11,7 +11,7 @@
<div>
<#list platform.getPossibleVersions() as version>
<label for="version-${version}">${version}</label>
<input form="${form}" id="version-${version}" type="checkbox" name="versions" value="${version}" <#if tag.data?has_content && tag.data == version>checked</#if>>
<input form="${form}" id="version-${version}" type="checkbox" name="versions" value="${version}" <#if tag.data?has_content && tag.data?seq_contains(version)>checked</#if>>
<#if (version?index + 1) % 5 == 0></div><div></#if>
</#list>
</div>

201
src/main/resources/templates/projects/versions/create.ftlh
View File

@ -12,19 +12,28 @@
<#assign scriptsVar>
<script type="text/javascript" src="<@hangar.url "js/channelManage.js" />"></script>
<script type="text/javascript" src="<@hangar.url "js/pluginUpload.js" />"></script>
<script type="text/javascript" src="<@hangar.url "js/projectDetail.js" />"></script>
<#-- <script type="text/javascript" src="<@hangar.url "js/pluginUpload.js" />"></script>-->
<#-- <script type="text/javascript" src="<@hangar.url "js/projectDetail.js" />"></script>-->
<#if pending?? && !pending.dependencies??>
<script type="text/javascript" src="<@hangar.url "js/platform-choice.js" />"></script>
</#if>
<script>
window.DEFAULT_COLOR = '${config.channels.colorDefault.hex}';
window.OWNER_NAME = '${ownerName}';
window.PROJECT_SLUG = '${projectSlug}';
window.PENDING_VERSION = ${mapper.valueToTree(pending)};
window.CHANNELS = ${mapper.valueToTree(channels)};
window.FORUM_SYNC = ${forumSync?c};
</script>
<script type="text/javascript" src="<@hangar.url "js/versionCreateChannelNew.js" />"></script>
<script type="text/javascript" src="<@hangar.url "js/create-version.js" />"></script>
</#assign>
<#assign styleVar>
<link rel="stylesheet" href="<@hangar.url "css/create-version.css" />">
</#assign>
<#assign message><@spring.message "version.create.pageTitle" /></#assign>
<@base.base title="${message}" additionalScripts=scriptsVar>
<@base.base title="${message}" additionalScripts=scriptsVar additionalStyling=styleVar>
<div class="row">
<div class="${mainWidth}">
@ -39,191 +48,7 @@
<div class="minor create-blurb">
<span><@spring.messageArgs code="version.create.info" args=[projectName] /></span>
</div>
<#if pending??>
<#-- Show plugin meta -->
<#assign version = pending>
<div class="plugin-meta">
<table class="plugin-meta-table">
<tr>
<td><strong><@spring.message "version" /></strong></td>
<td>
<#if version.versionString??>
${version.versionString}
<#else>
<div class="form-group">
<label for="version-string-input" class="sr-only">Version String</label>
<input id="version-string-input" class="form-control" type="text" form="form-publish" name="versionString" required placeholder="Version">
</div>
</#if>
</td>
</tr>
<tr>
<td><strong><@spring.message "version.description" /></strong></td>
<td>
<#if version.versionString??>
<#if version.description?has_content>
${version.description}
<#else>
<#if projectDescription?has_content>
${projectDescription}
<#else>
<@spring.message "version.create.noDescription" />
</#if>
</#if>
<#else>
<div class="form-group">
<label for="version-description-input" class="sr-only">Version Description</label>
<input type="text" form="form-publish" name="versionDescription" class="form-control" id="version-description-input">
</div>
</#if>
</td>
</tr>
<#if version.fileName?? && !version.externalUrl??>
<tr>
<td><strong><@spring.message "version.filename" /></strong></td>
<td>${version.fileName}</td>
</tr>
<tr>
<td><strong><@spring.message "version.fileSize" /></strong></td>
<td>${utils.formatFileSize(version.fileSize)}</td>
</tr>
<#else>
<tr>
<td><strong><@spring.message "version.externalUrl" /></strong></td>
<td>
<div class="form-group">
<label for="external-url-input" class="sr-only"></label>
<input id="external-url-input" class="form-control" type="text" value="${version.externalUrl}" name="externalUrl" form="form-publish" required>
</div>
</td>
</tr>
</#if>
<tr>
<td><strong>Channel</strong></td>
<td class="form-inline">
<#-- Show channel selector if old project, editor if new project -->
<select id="select-channel" form="form-publish" name="channel-input" class="form-control">
<#list channels as channel>
<option value="${channel.name}" data-color="${channel.color.hex}" <#if channel.name == version.channelName>selected</#if>>
${channel.name}
</option>
</#list>
</select>
<a href="#">
<i id="channel-new" class="fas fa-plus" data-toggle="modal" data-target="#channel-settings"></i>
</a>
</td>
</tr>
<tr>
<td><strong>Platform</strong></td>
<td>
<#if version.dependencies??>
<div class="float-right" id="upload-platform-tags">
<#list version.dependenciesAsGhostTags as pair>
<@projectTag.tagTemplate @helper["io.papermc.hangar.model.viewhelpers.ViewTag"].fromVersionTag(pair.getRight()) pair.left "form-publish" />
</#list>
</div>
<#else>
<div id="platform-choice"></div>
</#if>
</td>
</tr>
<tr>
<td>
<label for="is-unstable-version" class="form-check-label">
<strong><@spring.message "version.create.unstable" /></strong>
</label>
</td>
<td class="rv">
<div class="form-check">
<input id="is-unstable-version" class="form-check-input" form="form-publish" name="unstable" type="checkbox" value="true">
</div>
<div class="clearfix"></div>
</td>
</tr>
<tr>
<td>
<label for="is-recommended-version" class="form-check-label">
<strong>Recommended</strong>
</label>
</td>
<td class="rv">
<div class="form-check">
<input id="is-recommended-version" class="form-check-input" form="form-publish" name="recommended" type="checkbox" checked value="true">
</div>
<div class="clearfix"></div>
</td>
</tr>
<tr>
<td>
<label for="create-forum-post-version" class="form-check-label"></label>
<strong>Create forum post</strong>
</td>
<td class="rv">
<div class="form-check">
<#-- @ftlvariable name="forumSync" type="java.lang.Boolean" -->
<input id="create-forum-post-version" class="form-check-input" form="form-publish" name="forum-post" type="checkbox" <#if forumSync> checked </#if> value="true">
</div>
<div class="clearfix"></div>
</td>
</tr>
</table>
</div>
<div class="release-bulletin">
<div>
<h3><@spring.message "version.releaseBulletin" /></h3>
<p><@spring.message "version.releaseBulletin.info" /></p>
<@editor.editor
cooked=markdownService.render(version.description!"")
savable=false
enabled=true
raw=version.description!""
cancellable=false
targetForm="form-publish"
/>
</div>
</div>
<script <#--@CSPNonce.attr-->>
window.buttonClick = function() {
document.getElementsByClassName('btn-edit')[0].click();
}
</script>
</#if>
<@form.form action=Routes.VERSIONS_UPLOAD.getRouteUrl(ownerName, projectSlug) method="POST"
enctype="multipart/form-data" id="form-upload" class="form-inline">
<@csrf.formField />
<label class="btn btn-info float-left" for="pluginFile">
<input id="pluginFile" name="pluginFile" type="file" style="display: none;" accept=".jar,.zip">
<@spring.message "version.create.selectFile" />
</label>
<@alertFile.alertFile />
</@form.form>
<#if pending??>
<#assign version = pending>
<#assign formAction>
<#if version.versionString??>${Routes.VERSIONS_PUBLISH.getRouteUrl(ownerName, projectSlug, version.versionString)}<#else>${Routes.VERSIONS_PUBLISH_URL.getRouteUrl(ownerName, projectSlug)}</#if>
</#assign>
<@form.form method="POST" action=formAction id="form-publish" class="float-right">
<@csrf.formField />
<input type="hidden" class="channel-color-input" name="channel-color-input" value="${config.channels.colorDefault.hex}">
<div><input type="submit" name="create" value="<@spring.message "version.create.publish" />" class="btn btn-primary"></div>
</@form.form>
<#else>
<@form.form action=Routes.VERSIONS_CREATE_EXTERNAL_URL.getRouteUrl(ownerName, projectSlug) method="POST" id="form-url-upload" class="form-inline">
<@csrf.formField />
<div class="input-group float-right" style="width: 50%">
<input type="text" class="form-control" id="externalUrl" name="externalUrl" placeholder="<@spring.message "version.create.externalUrl" />" style="width: 70%">
<div class="input-group-append">
<button class="btn btn-info" type="submit">Create Version</button>
</div>
</div>
</@form.form>
</#if>
<div id="create-version"></div>
</div>
</div>
<span class="float-left tos"><i><@spring.messageArgs code="version.create.tos" args=["#"] /></i></span>

97
src/main/resources/templates/projects/versions/view.ftlh
View File

@ -126,17 +126,17 @@
Admin actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="admin-version-actions">
<li><a href="${Routes.SHOW_LOG.getRouteUrl("", "", "", v.v.versionString, "", "", "")}">User Action Logs</a></li>
<div class="dropdown-menu" aria-labelledby="admin-version-actions">
<a class="dropdown-item" href="${Routes.SHOW_LOG.getRouteUrl("", "", "", v.v.versionString, "", "", "")}">User Action Logs</a>
<#if headerData.globalPerm(Permission.Reviewer)>
<#if v.v.visibility == Visibility.SOFTDELETE>
<li><a href="#" data-toggle="modal" data-target="#modal-restore">Undo delete</a></li>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#modal-restore">Undo delete</a>
</#if>
<#if headerData.globalPerm(Permission.HardDeleteVersion) && !v.recommended && (v.p.publicVersions gt 1 || v.v.visibility == Visibility.SOFTDELETE)>
<li><a href="#" data-toggle="modal" data-target="#modal-harddelete" style="color: darkred">Hard delete</a></li>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#modal-harddelete" style="color: darkred">Hard delete</a>
</#if>
</#if>
</ul>
</div>
</div>
</#if>
@ -171,61 +171,42 @@
</div>
</div>
<#if v.v.dependencies?has_content>
<!-- Dependencies -->
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h3 class="card-title">Dependencies</h3>
</div>
<ul class="list-group">
<#assign Platform=@helper["io.papermc.hangar.model.Platform"] />
<#-- @ftlvariable name="Platform" type="io.papermc.hangar.model.Platform" -->
<#-- todo: dependency identification -->
<#list Platform.getPlatforms(v.dependencies?map(d -> d.pluginId)) as platform>
<#assign dependency=v.dependencies?filter(d -> d.pluginId == platform.dependencyId)?first />
<#if dependency?has_content>
<li class="list-group-item">
<a href="${platform.url}">
<strong>${platform.getName()}</strong>
</a>
<#if dependency.version?has_content>
<p class="version-string">${dependency.version}</p>
<#else>
<p class="version-string">N/A</p>
</#if>
</li>
</#if>
</#list>
<#list v.filteredDependencies as depend, project>
<li class="list-group-item">
<#if project??>
<a href="${Routes.PROJECTS_SHOW.getRouteUrl(project.ownerName, project.slug)}">
<strong>${project.name}</strong>
</a>
<#else>
<div class="minor">
<#-- todo: dependency identification -->
${depend.pluginId}
<i class="fas fa-question-circle"
title="<@spring.message "version.dependency.notOnOre" />"
data-toggle="tooltip" data-placement="right"></i>
</div>
</#if>
<#if depend.version??>
<p class="version-string">${depend.version}</p>
</#if>
</li>
</#list>
</ul>
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h3 class="card-title">Dependencies</h3>
</div>
<ul class="list-group">
<#assign Platform=@helper["io.papermc.hangar.model.Platform"] />
<#list v.formattedDependencies as pd, deps>
<li class="list-group-item" style="background-color: ${pd.platform.tagColor.background}22">
<a href="${pd.platform.url}">
<strong>${pd.platform.getName()}</strong>
</a>
<#if pd.versions?size != 0>
<span class="version-string">${pd.formattedVersion}</span>
</#if>
<#if deps?? && deps?size != 0>
<ul class="list-group">
<#list deps as dep, url>
<#-- @ftlvariable name="dep" type="io.papermc.hangar.model.generated.Dependency" -->
<li class="list-group-item">
<#if url?has_content>
<a href="${url}">
${dep.name}
</a>
<#else>
${dep.name}
</#if>
</li>
</#list>
</ul>
</#if>
</li>
</#list>
</ul>
</div>
<#else>
<p class="minor text-center"><i><@spring.message "version.dependency.no" /></i></p>
</#if>
</div>
</div>
<#if sp.perms(Permission.DeleteVersion) && v.p.publicVersions != 1>

95
src/main/resources/templates/projects/view.ftlh
View File

@ -14,12 +14,12 @@ Base template for Project overview.
<#-- @ftlvariable name="sp" type="io.papermc.hangar.model.viewhelpers.ScopedProjectData" -->
<#assign scriptsVar>
<script <#-- @CSPNonce.attr -->>
window.PROJECT_OWNER = "${p.project.ownerName}";
window.PROJECT_SLUG = "${p.project.slug}";
window.NAMESPACE = "${p.project.ownerName}/${p.project.slug}";
window.ALREADY_STARRED = ${sp.starred?c};
window.PROJECT_OWNER = "${p.project.ownerName}";
window.PROJECT_SLUG = "${p.project.slug}";
window.NAMESPACE = "${p.project.ownerName}/${p.project.slug}";
window.ALREADY_STARRED = ${sp.starred?c};
window.ACTIVE_NAV = "${active}";
window.ACTIVE_NAV = "${active}";
</script>
${additionalScripts}
<script type="text/javascript" src="<@hangar.url "js/projectDetail.js" />"></script>
@ -27,12 +27,12 @@ Base template for Project overview.
</#assign>
<#assign metaVar>
<meta property="og:title" content="${p.project.ownerName}/${p.project.name}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}" />
<meta property="og:image" content="${p.iconUrl}" />
<meta property="og:site_name" content="<@spring.message "general.appName" />" />
<meta property="og:description" content="${p.project.description!}" />
<meta property="og:title" content="${p.project.ownerName}/${p.project.name}"/>
<meta property="og:type" content="website"/>
<meta property="og:url" content="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}"/>
<meta property="og:image" content="${p.iconUrl}"/>
<meta property="og:site_name" content="<@spring.message "general.appName" />"/>
<meta property="og:description" content="${p.project.description!}"/>
</#assign>
<@base.base title=(p.project.ownerName + " / " + p.project.name) additionalScripts=scriptsVar additionalStyling=additionalStyling additionalMeta=metaVar>
@ -43,7 +43,8 @@ Base template for Project overview.
<div class="alert alert-danger" role="alert" style="margin: 0.2em 0 0 0">
<#if p.visibility == Visibility.NEEDSCHANGES>
<#if sp.perms(Permission.EditPage)>
<a class="btn btn-success float-right" href="/${p.fullSlug}/manage/sendforapproval">Send for approval</a>
<a class="btn btn-success float-right" href="/${p.fullSlug}/manage/sendforapproval">Send
for approval</a>
</#if>
<strong><@spring.message "visibility.notice." + p.visibility.getName() /></strong>
<br>
@ -68,7 +69,8 @@ Base template for Project overview.
<div class="project-path">
<a href="${Routes.USERS_SHOW_PROJECTS.getRouteUrl(p.project.ownerName)}">${p.project.ownerName}</a>
/
<a class="project-name" href="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}">${p.project.name}</a>
<a class="project-name"
href="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}">${p.project.name}</a>
</div>
<div>
<#if p.project.description??>
@ -93,10 +95,10 @@ Base template for Project overview.
<#if !p.isOwner(headerData.getCurrentUser())>
<button class="btn btn-default btn-star">
<i id="icon-star" <#if sp.starred>
class="fas fa-star"
<#else>
class="far fa-star"
</#if>></i>
class="fas fa-star"
<#else>
class="far fa-star"
</#if>></i>
<span class="starred">${p.starCount}</span>
</button>
@ -113,8 +115,8 @@ Base template for Project overview.
<!-- Flag button -->
<#if headerData.hasUser() && !p.isOwner(headerData.getCurrentUser())
&& !sp.uprojectFlags
&& p.getVisibility() != Visibility.SOFTDELETE>
&& !sp.uprojectFlags
&& p.getVisibility() != Visibility.SOFTDELETE>
<button data-toggle="modal" data-target="#modal-flag" class="btn btn-default">
<i class="fas fa-flag"></i> <@spring.message "project.flag" />
</button>
@ -124,7 +126,8 @@ Base template for Project overview.
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="label-flag">Flag project</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@ -139,14 +142,15 @@ Base template for Project overview.
<li class="list-group-item">
<span>${reason.title}</span>
<span class="float-right">
<input type="radio" required value="${reason.name()}" name="flag-reason" />
<input type="radio" required
value="${reason.name()}" name="flag-reason"/>
</span>
</li>
</#list>
</ul>
<input class="form-control" name="comment" type="text"
maxlength="255" required="required"
placeholder="<@spring.message "ph.comment" />&hellip;" />
placeholder="<@spring.message "ph.comment" />&hellip;"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
@ -161,23 +165,27 @@ Base template for Project overview.
</#if>
<#if headerData.hasUser() && (headerData.globalPerm(Permission.ModNotesAndFlags) || headerData.globalPerm(Permission.ViewLogs))>
<button class="btn btn-alert dropdown-toggle" type="button" id="admin-actions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button class="btn btn-alert dropdown-toggle" type="button" id="admin-actions"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Admin actions
</button>
<div class="dropdown-menu" aria-labelledby="admin-actions">
<#if headerData.globalPerm(Permission.ModNotesAndFlags)>
<a href="${Routes.PROJECTS_SHOW_FLAGS.getRouteUrl(p.project.ownerName, p.project.slug)}" class="dropdown-item">
<a href="${Routes.PROJECTS_SHOW_FLAGS.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="dropdown-item">
Flag history (${p.flagCount})
</a>
</#if>
<#if headerData.globalPerm(Permission.ModNotesAndFlags)>
<a href="${Routes.PROJECTS_SHOW_NOTES.getRouteUrl(p.project.ownerName, p.project.slug)}" class="dropdown-item">
Staff notes (${p.noteCount})
<a href="${Routes.PROJECTS_SHOW_NOTES.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="dropdown-item">
Staff notes (${p.noteCount})
</a>
</#if>
<#if headerData.globalPerm(Permission.ViewLogs)>
<a href="${Routes.SHOW_LOG.getRouteUrl("", "", p.project.slug, "", "", "", "")}" class="dropdown-item">
User Action Logs
<a href="${Routes.SHOW_LOG.getRouteUrl("", "", p.project.slug, "", "", "", "")}"
class="dropdown-item">
User Action Logs
</a>
</#if>
<a href="https://papermc.io/forums/${p.project.ownerName}" class="dropdown-item">
@ -209,7 +217,7 @@ Base template for Project overview.
</div>
</div>
<!-- Nav -->
<!-- Nav -->
<div class="row row-nav">
<div class="col-md-12">
<div class="navbar navbar-light project-navbar float-left navbar-expand-lg">
@ -217,28 +225,32 @@ Base template for Project overview.
<ul class="nav navbar-nav">
<!-- Tabs -->
<li id="docs" class="nav-item">
<a href="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}" class="nav-link">
<a href="${Routes.PROJECTS_SHOW.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="nav-link">
<i class="fas fa-book"></i> <@spring.message "project.docs" /></a>
</li>
<li id="versions" class="nav-item">
<a href="${Routes.VERSIONS_SHOW_LIST.getRouteUrl(p.project.ownerName, p.project.slug)}" class="nav-link">
<a href="${Routes.VERSIONS_SHOW_LIST.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="nav-link">
<i class="fas fa-download"></i> <@spring.message "project.versions" />
</a>
</li>
<#if p.project.topicId??>
<li id="discussion" class="nav-item">
<a href="${Routes.PROJECTS_SHOW_DISCUSSION.getRouteUrl(p.project.ownerName, p.project.slug)}" class="nav-link">
<a href="${Routes.PROJECTS_SHOW_DISCUSSION.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="nav-link">
<i class="fas fa-users"></i> <@spring.message "project.discuss" />
</a>
</li>
</#if>
<#if sp.perms(Permission.EditProjectSettings)>
<#-- Show manager if permitted -->
<#-- Show manager if permitted -->
<li id="settings" class="nav-item">
<a href="${Routes.PROJECTS_SHOW_SETTINGS.getRouteUrl(p.project.ownerName, p.project.slug)}" class="nav-link">
<a href="${Routes.PROJECTS_SHOW_SETTINGS.getRouteUrl(p.project.ownerName, p.project.slug)}"
class="nav-link">
<i class="fas fa-cog"></i> <@spring.message "project.settings" />
</a>
</li>
@ -249,7 +261,8 @@ Base template for Project overview.
<li id="homepage" class="nav-item">
<a title="${homepage}" target="_blank" rel="noopener"
href="<@hangar.linkout homepage/>" class="nav-link">
<i class="fas fa-home"></i> Homepage <i class="fas fa-external-link-alt"></i></a>
<i class="fas fa-home"></i> Homepage <i
class="fas fa-external-link-alt"></i></a>
</li>
</#if>
@ -257,8 +270,9 @@ Base template for Project overview.
<#assign issues>${p.project.issues}</#assign>
<li id="issues" class="nav-item">
<a title="${issues}" target="_blank" rel="noopener"
href="<@hangar.linkout issues/>" class="nav-link">
<i class="fas fa-bug"></i> Issues <i class="fas fa-external-link-alt"></i></a>
href="<@hangar.linkout issues/>" class="nav-link">
<i class="fas fa-bug"></i> Issues <i
class="fas fa-external-link-alt"></i></a>
</li>
</#if>
@ -266,7 +280,7 @@ Base template for Project overview.
<#assign source>${p.project.source}</#assign>
<li id="source" class="nav-item">
<a title="${source}" target="_blank" rel="noopener"
href="<@hangar.linkout source/>" class="nav-link">
href="<@hangar.linkout source/>" class="nav-link">
<i class="fas fa-code"></i> Source <i class="fas fa-external-link-alt"></i>
</a>
</li>
@ -276,8 +290,9 @@ Base template for Project overview.
<#assign support>${p.project.support}</#assign>
<li id="support" class="nav-item">
<a title="${support}" target="_blank" rel="noopener"
href="<@hangar.linkout support/>" class="nav-link">
<i class="fas fa-question-circle"></i> Support <i class="fas fa-external-link-alt"></i>
href="<@hangar.linkout support/>" class="nav-link">
<i class="fas fa-question-circle"></i> Support <i
class="fas fa-external-link-alt"></i>
</a>
</li>
</#if>

36
src/test/java/io/papermc/hangar/service/plugindata/PluginDataServiceTest.java
View File

@ -36,12 +36,12 @@ class PluginDataServiceTest {
assertEquals("3.0.5", data.getVersion());
assertEquals("https://www.spigotmc.org/resources/maintenance.40699/", data.getWebsite());
assertEquals(List.of("KennyTV"), data.getAuthors());
assertEquals(4, data.getDependencies().size());
assertEquals("ProtocolLib", data.getDependencies().get(0).getPluginId());
assertEquals("ServerListPlus", data.getDependencies().get(1).getPluginId());
assertEquals("ProtocolSupport", data.getDependencies().get(2).getPluginId());
assertEquals("paperapi", data.getDependencies().get(3).getPluginId());
assertEquals("1.13", data.getDependencies().get(3).getVersion());
// assertEquals(4, data.getDependencies().size());
// assertEquals("ProtocolLib", data.getDependencies().get(0).getPluginId());
// assertEquals("ServerListPlus", data.getDependencies().get(1).getPluginId());
// assertEquals("ProtocolSupport", data.getDependencies().get(2).getPluginId());
// assertEquals("paperapi", data.getDependencies().get(3).getPluginId());
// assertEquals("1.13", data.getDependencies().get(3).getVersion());
}
@Test
@ -54,8 +54,8 @@ class PluginDataServiceTest {
assertEquals("3.0.5", data.getVersion());
assertEquals("https://www.spigotmc.org/resources/maintenance.40699/", data.getWebsite());
assertEquals(List.of("KennyTV"), data.getAuthors());
assertEquals(1, data.getDependencies().size());
assertEquals("waterfall", data.getDependencies().get(0).getPluginId());
// assertEquals(1, data.getDependencies().size());
// assertEquals("waterfall", data.getDependencies().get(0).getPluginId());
}
@Test
@ -68,10 +68,10 @@ class PluginDataServiceTest {
assertEquals("3.0.5", data.getVersion());
assertEquals("https://forums.velocitypowered.com/t/maintenance/129", data.getWebsite());
assertEquals(List.of("KennyTV"), data.getAuthors());
assertEquals(2, data.getDependencies().size());
assertEquals("serverlistplus", data.getDependencies().get(0).getPluginId());
assertEquals(false, data.getDependencies().get(0).isRequired());
assertEquals("velocity", data.getDependencies().get(1).getPluginId());
// assertEquals(2, data.getDependencies().size());
// assertEquals("serverlistplus", data.getDependencies().get(0).getPluginId());
// assertEquals(false, data.getDependencies().get(0).isRequired());
// assertEquals("velocity", data.getDependencies().get(1).getPluginId());
}
@Test
@ -110,12 +110,12 @@ class PluginDataServiceTest {
assertEquals("3.0.5", data.getVersion());
assertEquals("https://www.spigotmc.org/resources/maintenance.40699/", data.getWebsite());
assertEquals(List.of("KennyTV"), data.getAuthors());
assertEquals(4, data.getDependencies().size());
assertEquals("ProtocolLib", data.getDependencies().get(0).getPluginId());
assertEquals("ServerListPlus", data.getDependencies().get(1).getPluginId());
assertEquals("ProtocolSupport", data.getDependencies().get(2).getPluginId());
assertEquals("paperapi", data.getDependencies().get(3).getPluginId());
assertEquals("1.13", data.getDependencies().get(3).getVersion());
// assertEquals(4, data.getDependencies().size());
// assertEquals("ProtocolLib", data.getDependencies().get(0).getPluginId());
// assertEquals("ServerListPlus", data.getDependencies().get(1).getPluginId());
// assertEquals("ProtocolSupport", data.getDependencies().get(2).getPluginId());
// assertEquals("paperapi", data.getDependencies().get(3).getPluginId());
// assertEquals("1.13", data.getDependencies().get(3).getVersion());
}
@Test

23
src/test/java/io/papermc/hangar/util/FormattedVersionsTest.java Normal file
View File

@ -0,0 +1,23 @@
package io.papermc.hangar.util;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
public class FormattedVersionsTest {
@Test
void testFormattedVersions() {
List<String> list1 = List.of("1.1", "1.2", "1.3", "1.5", "1.7", "1.8");
Assertions.assertEquals(StringUtils.formatVersionNumbers(new ArrayList<>(list1)), "1.1-3, 1.5, 1.7-8");
List<String> list2 = List.of("1.20", "1.23", "1.25", "1.30", "1.31");
Assertions.assertEquals(StringUtils.formatVersionNumbers(new ArrayList<>(list2)), "1.20, 1.23, 1.25, 1.30-31");
List<String> list3 = List.of("1.1.0", "1.1.1", "1.2.0", "1.2.2", "1.3", "1.4");
Assertions.assertEquals(StringUtils.formatVersionNumbers(new ArrayList<>(list3)), "1.1.0-1, 1.2.0, 1.2.2, 1.3-4");
}
}