Passed
Pull Request — master (#788)
by John
06:12
created
app/Models/Eloquent/Messager/GroupMemberMessager.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 {
9 9
     public static function sendApplyJoinMessageToLeader($config)
10 10
     {
11
-        $messages = Message::where([
11
+        $messages=Message::where([
12 12
             'receiver' => $config['receiver'],
13 13
             'type'     => $config['type'],
14 14
             'unread'   => true
@@ -16,11 +16,11 @@  discard block
 block discarded – undo
16 16
 
17 17
         if (filled($messages)) {
18 18
             foreach ($messages as $message) {
19
-                $data = json_decode($message->data, true);
20
-                if ($data['group']['gcode'] == $config['data']['group']['gcode']) {
19
+                $data=json_decode($message->data, true);
20
+                if ($data['group']['gcode']==$config['data']['group']['gcode']) {
21 21
                     array_push($data['user'], $config['data']['user'][0]);
22
-                    $message->data = json_encode($data);
23
-                    $message->level = $config['level'];
22
+                    $message->data=json_encode($data);
23
+                    $message->level=$config['level'];
24 24
                     $message->save();
25 25
                     return true;
26 26
                 }
@@ -32,25 +32,25 @@  discard block
 block discarded – undo
32 32
 
33 33
     private static function proceedUserAndGroupInfo($data)
34 34
     {
35
-        $userList = [];
35
+        $userList=[];
36 36
 
37 37
         foreach ($data['user'] as $user) {
38
-            $uid = $user['uid'];
39
-            $name = $user['name'];
40
-            $url = route('user.view', ['uid' => $uid]);
41
-            $userList[] = "[$name]($url)";
38
+            $uid=$user['uid'];
39
+            $name=$user['name'];
40
+            $url=route('user.view', ['uid' => $uid]);
41
+            $userList[]="[$name]($url)";
42 42
         }
43 43
 
44
-        $userString = implode(__('message.delimiter'), $userList);
45
-        $groupName = $data['group']['name'];
46
-        $groupURL = route('group.detail', ['gcode' => $data['group']['gcode']]);
44
+        $userString=implode(__('message.delimiter'), $userList);
45
+        $groupName=$data['group']['name'];
46
+        $groupURL=route('group.detail', ['gcode' => $data['group']['gcode']]);
47 47
 
48 48
         return [$userString, $groupName, $groupURL];
49 49
     }
50 50
 
51 51
     public static function formatApplyJoinMessageToLeader($data)
52 52
     {
53
-        [$userString, $groupName, $groupURL] = self::proceedUserAndGroupInfo($data);
53
+        [$userString, $groupName, $groupURL]=self::proceedUserAndGroupInfo($data);
54 54
 
55 55
         return self::formatUniversalMessage('message.group.applied.desc', [
56 56
             'userList' => $userString,
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
     public static function sendAgreedJoinMessageToLeader($config)
64 64
     {
65
-        $messages = Message::where([
65
+        $messages=Message::where([
66 66
             'receiver' => $config['receiver'],
67 67
             'type'     => $config['type'],
68 68
             'unread'   => true
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 
71 71
         if (filled($messages)) {
72 72
             foreach ($messages as $message) {
73
-                $data = json_decode($message->data, true);
74
-                if ($data['group'] == $config['data']['group']) {
73
+                $data=json_decode($message->data, true);
74
+                if ($data['group']==$config['data']['group']) {
75 75
                     array_push($data['user'], $config['data']['user'][0]);
76
-                    $message->data = json_encode($data);
77
-                    $message->level = $config['level'];
76
+                    $message->data=json_encode($data);
77
+                    $message->level=$config['level'];
78 78
                     $message->save();
79 79
                     return true;
80 80
                 }
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
     public static function formatAgreedJoinMessageToLeader($data)
88 88
     {
89
-        [$userString, $groupName, $groupURL] = self::proceedUserAndGroupInfo($data);
89
+        [$userString, $groupName, $groupURL]=self::proceedUserAndGroupInfo($data);
90 90
 
91 91
         return self::formatUniversalMessage('message.group.agreed.desc', [
92 92
             'userList' => $userString,
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 
104 104
     public static function formatInvitedMessageToUser($data)
105 105
     {
106
-        $senderName = $data['sender']['name'];
107
-        $groupName = $data['group']['name'];
108
-        $groupURL = route('group.detail', ['gcode' => $data['group']['gcode']]);
106
+        $senderName=$data['sender']['name'];
107
+        $groupName=$data['group']['name'];
108
+        $groupURL=route('group.detail', ['gcode' => $data['group']['gcode']]);
109 109
 
110 110
         return self::formatUniversalMessage('message.group.invited.desc', [
111 111
             'senderName' => $senderName,
Please login to merge, or discard this patch.
app/Models/Eloquent/Messager/SolutionStatusMessager.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -8,21 +8,21 @@  discard block
 block discarded – undo
8 8
 {
9 9
     public static function sendSolutionPassedMessageToUser($config)
10 10
     {
11
-        $message = Message::where([
11
+        $message=Message::where([
12 12
             'receiver' => $config['receiver'],
13 13
             'type'     => $config['type'],
14 14
             'unread'   => true
15 15
         ])->first();
16 16
 
17 17
         if (filled($message)) {
18
-            $data = json_decode($message->data, true);
18
+            $data=json_decode($message->data, true);
19 19
             foreach ($data['problem'] as $problem) {
20
-                if($problem['pcode'] != $config['data']['problem'][0]['pcode']) {
20
+                if ($problem['pcode']!=$config['data']['problem'][0]['pcode']) {
21 21
                     array_push($data['problem'], $config['data']['problem'][0]);
22 22
                 }
23 23
             }
24
-            $message->data = json_encode($data);
25
-            $message->level = $config['level'];
24
+            $message->data=json_encode($data);
25
+            $message->level=$config['level'];
26 26
             $message->save();
27 27
             return true;
28 28
         }
@@ -32,23 +32,23 @@  discard block
 block discarded – undo
32 32
 
33 33
     private static function proceedUserAndGroupInfo($data)
34 34
     {
35
-        $problemList = [];
35
+        $problemList=[];
36 36
 
37 37
         foreach ($data['problem'] as $problem) {
38
-            $pcode = $problem['pcode'];
39
-            $title = $problem['title'];
40
-            $url = route('problem.detail', ['pcode' => $pcode]);
41
-            $problemList[] = "[$pcode $title]($url)";
38
+            $pcode=$problem['pcode'];
39
+            $title=$problem['title'];
40
+            $url=route('problem.detail', ['pcode' => $pcode]);
41
+            $problemList[]="[$pcode $title]($url)";
42 42
         }
43 43
 
44
-        $problemString = implode(__('message.delimiter'), $problemList);
44
+        $problemString=implode(__('message.delimiter'), $problemList);
45 45
 
46 46
         return [$problemString];
47 47
     }
48 48
 
49 49
     public static function formatSolutionPassedMessageToUser($data)
50 50
     {
51
-        [$problemString] = self::proceedUserAndGroupInfo($data);
51
+        [$problemString]=self::proceedUserAndGroupInfo($data);
52 52
 
53 53
         return self::formatUniversalMessage('message.solution.accepted.desc', [
54 54
             'problemList' => $problemString,
@@ -59,21 +59,21 @@  discard block
 block discarded – undo
59 59
 
60 60
     public static function sendSolutionRejectedMessageToUser($config)
61 61
     {
62
-        $message = Message::where([
62
+        $message=Message::where([
63 63
             'receiver' => $config['receiver'],
64 64
             'type'     => $config['type'],
65 65
             'unread'   => true
66 66
         ])->first();
67 67
 
68 68
         if (filled($message)) {
69
-            $data = json_decode($message->data, true);
69
+            $data=json_decode($message->data, true);
70 70
             foreach ($data['problem'] as $problem) {
71
-                if($problem['pcode'] != $config['data']['problem'][0]['pcode']) {
71
+                if ($problem['pcode']!=$config['data']['problem'][0]['pcode']) {
72 72
                     array_push($data['problem'], $config['data']['problem'][0]);
73 73
                 }
74 74
             }
75
-            $message->data = json_encode($data);
76
-            $message->level = $config['level'];
75
+            $message->data=json_encode($data);
76
+            $message->level=$config['level'];
77 77
             $message->save();
78 78
             return true;
79 79
         }
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
     public static function formatSolutionRejectedMessageToUser($data)
85 85
     {
86
-        [$problemString] = self::proceedUserAndGroupInfo($data);
86
+        [$problemString]=self::proceedUserAndGroupInfo($data);
87 87
 
88 88
         return self::formatUniversalMessage('message.solution.declined.desc', [
89 89
             'problemList' => $problemString,
Please login to merge, or discard this patch.
app/Http/Controllers/MessageController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
 
21 21
     public function detail($id)
22 22
     {
23
-        $message = Message::find($id);
23
+        $message=Message::find($id);
24 24
 
25
-        if (blank($message) || $message->receiver != Auth::user()->id) {
25
+        if (blank($message) || $message->receiver!=Auth::user()->id) {
26 26
             return Redirect::route('message.index');
27 27
         }
28 28
 
Please login to merge, or discard this patch.
app/Http/Controllers/Ajax/MessageController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@
 block discarded – undo
15 15
         $request->validate([
16 16
             'uid' => 'required|integer'
17 17
         ]);
18
-        $uid = $request->input('uid');
19
-        if (!Auth::check() || Auth::user()->id != $uid) {
18
+        $uid=$request->input('uid');
19
+        if (!Auth::check() || Auth::user()->id!=$uid) {
20 20
             return ResponseModel::err(2001);
21 21
         }
22
-        $ret = Message::unread($uid);
22
+        $ret=Message::unread($uid);
23 23
         return ResponseModel::success(200, null, $ret);
24 24
     }
25 25
 
Please login to merge, or discard this patch.