WIP: Group feature

README.md

@@ -2,12 +2,12 @@
 
 ## About Project
 
-works pretty similar to a well known social network, but you can host it on your very own infrastructure. No external dependencies needed. Focus of this project was security and performance.
+works pretty similar to a well known social network, but you can host it on your very own infrastructure. No external dependencies needed. Focus of this project is stability. security and performance.
 
 ## Anouncement
 
-On 13.02.2020 i decided to move version 2.0 to deprecated branch
-At moment the new master has less features than 2.0, but iam working hard to restore the most important ones.
+On 13.02.2020 i decided to mark version 2.0 as deprecated and started to rewrite everything from scratch.
+At moment the master has less features than 2.0, but iam working hard to restore the most important ones.
 Feel free to join the development process by creating tasks (feature request) or make code improvements.
 
 
@@ -135,16 +135,14 @@ Demo is still alive here: https://social.codejungle.org/
 Please report feature requests and bugs.
 Demo is here: https://dev.codejungle.org/
 
-Planed features:  
+Working features are:
 
-oauth login
-websockets (notifications)
-hashtags interpretation
-image gallery
-profile
+* Share, Commnet, Reshare, Likes
+* OpenGraph Tag parsing
+* OAuth login via Github and Facebook
 
-low prio
-syntaxhighlighting
+**Attention**
+This is a early stage beta, things can change drasticly.
 
 
 ## 4. Donate

app/Content.php

@@ -13,7 +13,7 @@ class Content extends Model
      */
     protected $fillable = [
       'user_id', 'html_content', 'json_content', 'anonymous',
-      'has_comment', 'is_comment', 'parent_id',
+      'has_comment', 'is_comment', 'comments', 'parent_id',
   ];
 
     /**

app/Group.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Group extends Model
+{
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+    'name', 'description', 'avatar',
+    'background', 'visibility', 'members', 'posts',
+  ];
+
+    public function content()
+    {
+        return $this->belongsToMany('App\Content');
+    }
+}

app/GroupMembers.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class GroupMembers extends Model
+{
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+    'group_id', 'user_id', 'status', 'is_moderator',
+  ];
+
+    /**
+     * Get the user.
+     */
+    public function user()
+    {
+        return $this->belongsTo('App\User');
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -77,13 +77,15 @@ public function socialLiteLogin($provider)
 
         return response()->json([
              'user' => $user,
+             'groups' => $user->groups()->get()
          ]);
     }
 
     protected function authenticated(Request $request, $user)
     {
         return response()->json([
            'user' => $user,
+           'groups' => $user->groups()->get()
        ]);
     }
 }

app/Http/Controllers/ContentController.php

@@ -3,13 +3,15 @@
 namespace App\Http\Controllers;
 
 use App\Content;
+use App\Group;
 use App\Http\Controllers\Helper\RemoteContent;
 use App\Http\Requests\ContentDestroyRequest;
 use App\Http\Requests\ContentStoreRequest;
 use Auth;
 use DB;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
+use Stevebauman\Purify\Facades\Purify;
 
 class ContentController extends Controller
 {
@@ -19,20 +21,36 @@ public function store(ContentStoreRequest $request)
 
         $content = new Content();
         $content->json_content = json_encode($validated['json_content']);
-        $content->html_content = $validated['html_content'];
-        $content->anonymous = $validated['anonymous'];
+        $content->html_content = Purify::clean($validated['html_content']);
+        $content->anonymous = ($validated['anonymous'] ? 'true' : 'false');
+        if($validated['anonymous']==true)
+        {
+            $content->user_id=(getenv("anonymous") !== false ? getenv("anonymous") : 1 );
+        } else {
+          $content->user_id = Auth::user()->id;
+        }
         $content->visibility = $validated['visibility'];
 
         $content->has_comment = ($validated['has_comment'] ? 'true' : 'false');
         $content->is_comment = ($validated['is_comment'] ? 'true' : 'false');
+        $content->comments = 0;
         $content->parent_id = $validated['parent_id'];
 
-        $content->user_id = Auth::user()->id;
+        $content->group_id = ($request->group_id > 0 ? $request->group_id : 0);
+
+        if ($content->group_id > 0) {
+            $group = Group::find($content->group_id);
+            $group->posts = $group->posts + 1;
+            $group->save();
+        }
+
+
         $content->save();
 
         if ($request->is_comment) {
             $parent = Content::find($request->parent_id);
             $parent->has_comment = 'true';
+            $parent->comments = $parent->comments + 1;
             $parent->save();
         }
 
@@ -85,6 +103,9 @@ public function index(Request $request)
         if ($request->has('user_id') && $request->user_id > 0) {
             $content->where('users.id', '=', $request->user_id);
         }
+        if ($request->has('group_id') && $request->group_id > 0) {
+            $content->where('contents.group_id', '=', $request->group_id);
+        }
         if ($request->has('limit') && $request->limit <= 100) {
             $content->limit($request->limit);
         } else {
@@ -104,6 +125,15 @@ public function destroy(Request $request, $id)
         $content = Content::find($id);
 
         if ($content->user_id == Auth::user()->id) {
+            if ('true' == $content->is_comment) {
+                $parent = Content::find($content->parent_id);
+
+                $parent->comments = $parent->comments - 1;
+                if (0 == $parent->comments) {
+                    $parent->has_comment = 'false';
+                }
+                $parent->save();
+            }
             $content->destroy($id);
         }
     }