McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Moar federation

Browse source
This commit is contained in:
Tim Zöller 2025-12-03 07:18:43 +01:00
parent 4c9bcc718f
commit 45e9030c1d
2 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/main/java/org/operaton/fitpub/controller/ActivityController.java
View file

@ -136,49 +136,72 @@ public class ActivityController {
/**
* Format activity content for ActivityPub.
* Uses plain text with Unicode symbols for maximum compatibility across Fediverse platforms.
*/
private String formatActivityContent(Activity activity) {
StringBuilder content = new StringBuilder();
// Title (if present)
if (activity.getTitle() != null && !activity.getTitle().isEmpty()) {
content.append("<h3>").append(escapeHtml(activity.getTitle())).append("</h3>");
content.append(activity.getTitle()).append("\n\n");
}
// Description (if present)
if (activity.getDescription() != null && !activity.getDescription().isEmpty()) {
content.append("<p>").append(escapeHtml(activity.getDescription())).append("</p>");
content.append(activity.getDescription()).append("\n\n");
}
content.append("<p>");
content.append("<strong>Activity Type:</strong> ").append(activity.getActivityType()).append("<br>");
// Activity type with emoji
String activityEmoji = getActivityEmoji(activity.getActivityType());
content.append(activityEmoji).append(" ").append(activity.getActivityType());
// Metrics on separate lines
if (activity.getTotalDistance() != null) {
content.append("<strong>Distance:</strong> ")
.append(String.format("%.2f km", activity.getTotalDistance().doubleValue() / 1000.0))
.append("<br>");
content.append("\n📏 ")
.append(String.format("%.2f km", activity.getTotalDistance().doubleValue() / 1000.0));
}
if (activity.getTotalDurationSeconds() != null) {
long hours = activity.getTotalDurationSeconds() / 3600;
long minutes = (activity.getTotalDurationSeconds() % 3600) / 60;
long seconds = activity.getTotalDurationSeconds() % 60;
content.append("<strong>Duration:</strong> ");
content.append("\n⏱️ ");
if (hours > 0) {
content.append(hours).append("h ");
}
content.append(minutes).append("m ").append(seconds).append("s<br>");
content.append(minutes).append("m ").append(seconds).append("s");
}
if (activity.getElevationGain() != null) {
content.append("<strong>Elevation Gain:</strong> ")
.append(String.format("%.0f m", activity.getElevationGain()))
.append("<br>");
content.append("\n⛰️ ")
.append(String.format("%.0f m", activity.getElevationGain()));
}
content.append("</p>");
return content.toString();
}
/**
* Get an emoji for the activity type.
*/
private String getActivityEmoji(Activity.ActivityType type) {
return switch (type) {
case RUN -> "🏃";
case RIDE -> "🚴";
case HIKE -> "🥾";
case WALK -> "🚶";
case SWIM -> "🏊";
case ALPINE_SKI, BACKCOUNTRY_SKI, NORDIC_SKI -> "⛷️";
case SNOWBOARD -> "🏂";
case ROWING -> "🚣";
case KAYAKING, CANOEING -> "🛶";
case INLINE_SKATING -> "⛸️";
case ROCK_CLIMBING, MOUNTAINEERING -> "🧗";
case YOGA -> "🧘";
case WORKOUT -> "💪";
default -> "🏋️";
};
}
/**
* Simple HTML escaping.
*/

12
src/main/resources/templates/activities/detail.html
View file

@ -45,7 +45,7 @@
</p>
<p id="activityDescription" class="text-muted"></p>
</div>
<div class="btn-group" role="group">
<div class="btn-group" role="group" id="activityActions" style="display: none;">
<a href="#" id="editBtn" class="btn btn-outline-primary">
<i class="bi bi-pencil"></i> Edit
</a>
@ -315,8 +315,14 @@
document.getElementById('activityDescription').style.display = 'none';
}
// Edit button
document.getElementById('editBtn').href = `/activities/${activity.id}/edit`;
// Show Edit/Delete buttons only if user is logged in and owns the activity
if (FitPubAuth.isAuthenticated()) {
const currentUser = FitPubAuth.getCurrentUser();
if (currentUser && currentUser.id === activity.userId) {
document.getElementById('activityActions').style.display = 'block';
document.getElementById('editBtn').href = `/activities/${activity.id}/edit`;
}
}
// Metrics
document.getElementById('metricDistance').textContent = formatDistance(activity.totalDistance);