apply clang format to proto files (#4123)

* add proto files to clangify

* apply clangify to proto files

* remove blocksonsingleline, it didn't actually do anything

also add missing space to the travis warning, emoji are monospace too

.clang-format

@@ -25,3 +25,7 @@ IndentCaseLabels: true
 PointerAlignment: Right
 SortIncludes: true
 IncludeBlocks: Regroup
+---
+Language: Proto
+AllowShortFunctionsOnASingleLine: None
+SpacesInContainerLiterals: false

clangify.sh

@@ -18,7 +18,7 @@ exclude=("servatrice/src/smtp" \
 "oracle/src/zip" \
 "oracle/src/lzma" \
 "oracle/src/qt-json")
-exts=("cpp" "h")
+exts=("cpp" "h" "proto")
 cf_cmd="clang-format"
 branch="origin/master"
 

common/pb/admin_commands.proto

@@ -37,4 +37,3 @@ message Command_AdjustMod {
     optional bool should_be_mod = 2;
     optional bool should_be_judge = 3;
 }
-

common/pb/command_attach_card.proto

@@ -10,5 +10,3 @@ message Command_AttachCard {
     optional string target_zone = 4;
     optional sint32 target_card_id = 5 [default = -1];
 }
-
-

common/pb/command_concede.proto

@@ -6,7 +6,6 @@ message Command_Concede {
     }
 }
 
-
 message Command_Unconcede {
     extend GameCommand {
         optional Command_Unconcede ext = 1032;

common/pb/command_create_token.proto

@@ -15,5 +15,3 @@ message Command_CreateToken {
     optional string target_zone = 9;
     optional sint32 target_card_id = 10 [default = -1];
 }
-
-

common/pb/command_deck_del_dir.proto

@@ -7,4 +7,3 @@ message Command_DeckDelDir {
     }
     optional string path = 1;
 }
- 

common/pb/command_deck_download.proto

@@ -7,4 +7,3 @@ message Command_DeckDownload {
     }
     optional sint32 deck_id = 1 [default = -1];
 }
- 

common/pb/command_deck_new_dir.proto

@@ -8,4 +8,3 @@ message Command_DeckNewDir {
     optional string path = 1;
     optional string dir_name = 2;
 }
- 

common/pb/command_draw_cards.proto

@@ -6,4 +6,3 @@ message Command_DrawCards {
     }
     optional uint32 number = 1;
 }
-

common/pb/command_flip_card.proto

@@ -9,5 +9,3 @@ message Command_FlipCard {
     optional bool face_down = 3;
     optional string pt = 4;
 }
-
-

common/pb/command_game_say.proto

@@ -6,5 +6,3 @@ message Command_GameSay {
     }
     optional string message = 1;
 }
-
-

common/pb/command_kick_from_game.proto

@@ -6,4 +6,3 @@ message Command_KickFromGame {
     }
     optional sint32 player_id = 1 [default = -1];
 }
-

common/pb/command_leave_game.proto

@@ -5,4 +5,3 @@ message Command_LeaveGame {
         optional Command_LeaveGame ext = 1001;
     }
 }
-

common/pb/command_move_card.proto

@@ -23,4 +23,3 @@ message Command_MoveCard {
     optional sint32 x = 6 [default = -1];
     optional sint32 y = 7 [default = -1];
 }
-

common/pb/command_mulligan.proto

@@ -6,4 +6,3 @@ message Command_Mulligan {
     }
     optional uint32 number = 7;
 }
-

common/pb/command_replay_modify_match.proto

@@ -8,4 +8,3 @@ message Command_ReplayModifyMatch {
     optional sint32 game_id = 1 [default = -1];
     optional bool do_not_hide = 2;
 }
- 

common/pb/command_reverse_turn.proto

@@ -5,4 +5,3 @@ message Command_ReverseTurn {
         optional Command_ReverseTurn ext = 1034;
     }
 }
-

common/pb/command_roll_die.proto

@@ -6,4 +6,3 @@ message Command_RollDie {
     }
     optional uint32 sides = 1;
 }
-

common/pb/command_set_sideboard_plan.proto

@@ -8,4 +8,3 @@ message Command_SetSideboardPlan {
     }
     repeated MoveCard_ToZone move_list = 1;
 }
-

common/pb/command_shuffle.proto

@@ -8,4 +8,3 @@ message Command_Shuffle {
     optional sint32 start = 2 [default = 0];
     optional sint32 end = 3 [default = -1];
 }
-

common/pb/event_game_host_changed.proto

@@ -6,4 +6,3 @@ message Event_GameHostChanged {
         optional Event_GameHostChanged ext = 1003;
     }
 }
- 

common/pb/event_kicked.proto

@@ -6,4 +6,3 @@ message Event_Kicked {
         optional Event_Kicked ext = 1004;
     }
 }
-

common/pb/event_leave_room.proto

@@ -7,6 +7,3 @@ message Event_LeaveRoom {
     }
     optional string name = 1;
 }
- 
- 
- 

common/pb/event_notify_user.proto

@@ -18,5 +18,4 @@ message Event_NotifyUser {
     optional string warning_reason = 2;
     optional string custom_title = 3;
     optional string custom_content = 4;
-
 }

common/pb/event_room_say.proto

@@ -14,5 +14,4 @@ message Event_RoomSay {
     optional string message = 2;
     optional RoomMessageType message_type = 3;
     optional uint64 time_of = 4;
-
 }

common/pb/moderator_commands.proto

@@ -68,5 +68,4 @@ message Command_ViewLogHistory {
     repeated string log_location = 6;    // destination of message (ex: main room, game room, private chat)
     required uint32 date_range = 7;      // the length of time (in minutes) to look back for
     optional uint32 maximum_results = 8; // the maximum number of query results
-
 }

common/pb/response.proto

@@ -30,12 +30,14 @@ message Response {
         RespEmailRequiredToRegister = 25; // Server requires email to register accounts but client did not provide one
         RespTooManyRequests = 26;  // Server refused to complete command because client has sent too many too quickly
         RespPasswordTooShort = 27; // Server requires a decent password
-        RespAccountNotActivated = 28; // Client attempted to log into a registered username but the account hasn't been activated
+        RespAccountNotActivated =
+            28; // Client attempted to log into a registered username but the account hasn't been activated
         RespRegistrationDisabled = 29; // Server does not allow clients to register
         RespRegistrationFailed = 30;   // Server accepted a reg request but failed to perform the registration
         RespActivationAccepted = 31;   // Server accepted a reg user activation token
         RespActivationFailed = 32;     // Server didn't accept a reg user activation token
-        RespRegistrationAcceptedNeedsActivation = 33; // Server accepted cient registration, but it will need token activation
+        RespRegistrationAcceptedNeedsActivation =
+            33;                    // Server accepted cient registration, but it will need token activation
         RespClientIdRequired = 34; // Server requires client to generate and send its client id before allowing access
         RespClientUpdateRequired = 35; // Client is missing features that the server is requiring
         RespServerFull = 36;           // Server user limit reached

common/pb/response_get_games_of_user.proto

@@ -10,4 +10,3 @@ message Response_GetGamesOfUser {
     repeated ServerInfo_Room room_list = 1;
     repeated ServerInfo_Game game_list = 2;
 }
- 

common/pb/response_get_user_info.proto

@@ -8,5 +8,3 @@ message Response_GetUserInfo {
     }
     optional ServerInfo_User user_info = 1;
 }
- 
- 

common/pb/response_list_users.proto

@@ -8,4 +8,3 @@ message Response_ListUsers {
     }
     repeated ServerInfo_User user_list = 1;
 }
- 

common/pb/response_replay_download.proto

@@ -7,4 +7,3 @@ message Response_ReplayDownload {
     }
     optional bytes replay_data = 1;
 }
- 

common/pb/serverinfo_gametype.proto

@@ -3,4 +3,3 @@ message ServerInfo_GameType {
     optional sint32 game_type_id = 1;
     optional string description = 2;
 };
-