diff --git a/itests/test.py b/itests/test.py index 353aa558..a9d027c6 100644 --- a/itests/test.py +++ b/itests/test.py @@ -352,6 +352,9 @@ def run(): assert ( len(get_address_squeak_display_response.squeak_display_entries) == 2 ) + for squeak_display_entry in get_address_squeak_display_response.squeak_display_entries: + assert squeak_display_entry.author_name == "bob" + assert squeak_display_entry.author_address == squeak_profile_address # Get squeak profile by address get_profile_by_address_response = admin_stub.GetSqueakProfileByAddress( diff --git a/proto/squeak_admin.proto b/proto/squeak_admin.proto index 00c75eff..00219d41 100644 --- a/proto/squeak_admin.proto +++ b/proto/squeak_admin.proto @@ -174,7 +174,10 @@ message SqueakDisplayEntry { bool is_author_known = 8; /// The author name - string author_name = 9; + string author_address = 9; + + /// The author name + string author_name = 10; } message GetFollowedSqueakDisplaysRequest { diff --git a/squeakserver/admin/squeak_admin_server_servicer.py b/squeakserver/admin/squeak_admin_server_servicer.py index ca5a1700..7fbc8a39 100644 --- a/squeakserver/admin/squeak_admin_server_servicer.py +++ b/squeakserver/admin/squeak_admin_server_servicer.py @@ -119,12 +119,19 @@ class SqueakAdminServerServicer(squeak_admin_pb2_grpc.SqueakAdminServicer): block_header = squeak_entry.block_header is_unlocked = squeak.HasDecryptionKey() content_str = squeak.GetDecryptedContentStr() if is_unlocked else None + squeak_profile = squeak_entry_with_profile.squeak_profile + is_author_known = squeak_profile is not None + author_name = squeak_profile.profile_name if squeak_profile else None + author_address = str(squeak.GetAddress()) return squeak_admin_pb2.SqueakDisplayEntry( squeak_hash=get_hash(squeak).hex(), is_unlocked=squeak.HasDecryptionKey(), content_str=content_str, block_height=squeak.nBlockHeight, block_time=block_header.nTime, + is_author_known=is_author_known, + author_name=author_name, + author_address=author_address, ) def _squeak_profile_to_message(self, squeak_profile):